diff options
| author | Markus Wick <degasus@users.noreply.github.com> | 2016-06-26 12:48:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-26 12:48:59 +0200 |
| commit | 3887328bbaf43320b22ef2ca4ade325c23789d0f (patch) | |
| tree | 4b3501c75657ecca47e85e3aa3fd4361641b78a3 /Source/Core/DolphinWX/Main.cpp | |
| parent | b16333a25cc0d8396f71fa1e410484026adea964 (diff) | |
| parent | d79aeaa1e9b224b3bb147c605fb8ffd6e2bfc890 (diff) | |
Merge pull request #3510 from degasus/master
VideoBackends: Merge backend initialization and shutdown.
Diffstat (limited to 'Source/Core/DolphinWX/Main.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Main.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/Core/DolphinWX/Main.cpp b/Source/Core/DolphinWX/Main.cpp index 96fb4fa7f2..a9a7af6854 100644 --- a/Source/Core/DolphinWX/Main.cpp +++ b/Source/Core/DolphinWX/Main.cpp @@ -555,17 +555,16 @@ void Host_ConnectWiimote(int wm_idx, bool connect) } } -void Host_ShowVideoConfig(void* parent, const std::string& backend_name, - const std::string& config_name) +void Host_ShowVideoConfig(void* parent, const std::string& backend_name) { if (backend_name == "Software Renderer") { - SoftwareVideoConfigDialog diag((wxWindow*)parent, backend_name, config_name); + SoftwareVideoConfigDialog diag((wxWindow*)parent, backend_name); diag.ShowModal(); } else { - VideoConfigDiag diag((wxWindow*)parent, backend_name, config_name); + VideoConfigDiag diag((wxWindow*)parent, backend_name); diag.ShowModal(); } } |
