Merge pull request #3510 from degasus/master

VideoBackends: Merge backend initialization and shutdown.

1 files changed, 2 insertions, 6 deletions

diff --git a/Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp b/Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp
index f3737512e6..87c947bfcd 100644
--- a/Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp
+++ b/Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp
@@ -31,17 +31,13 @@ IntegerSetting<T>::IntegerSetting(wxWindow* parent, const wxString& label, T& se
   Bind(wxEVT_SPINCTRL, &IntegerSetting::UpdateValue, this);
 }
 
-SoftwareVideoConfigDialog::SoftwareVideoConfigDialog(wxWindow* parent, const std::string& title,
-                                                     const std::string& ininame)
+SoftwareVideoConfigDialog::SoftwareVideoConfigDialog(wxWindow* parent, const std::string& title)
     : wxDialog(parent, wxID_ANY,
                wxString(wxString::Format(_("Dolphin %s Graphics Configuration"), title)))
 {
   VideoConfig& vconfig = g_Config;
 
-  if (File::Exists(File::GetUserPath(D_CONFIG_IDX) + "GFX.ini"))
-    vconfig.Load(File::GetUserPath(D_CONFIG_IDX) + "GFX.ini");
-  else
-    vconfig.Load(File::GetUserPath(D_CONFIG_IDX) + ininame + ".ini");
+  vconfig.Load(File::GetUserPath(D_CONFIG_IDX) + "GFX.ini");
 
   wxNotebook* const notebook = new wxNotebook(this, wxID_ANY);