Merge pull request #7006 from spycrab/qt_profile_fix

Qt: Multiple profile fixes
dolphin-emu · May 28, 2018 · 62adfaa · 62adfaa
2 parents 75e87a8 + e6273b1
commit 62adfaa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingWidget.cpp b/Source/Core/DolphinQt2/Config/Mapping/MappingWidget.cpp
@@ -147,6 +147,8 @@ void MappingWidget::Update()
 
   for (auto* checkbox : m_bools)
     checkbox->Update();
+
+  SaveSettings();
 }
 
 ControllerEmu::EmulatedController* MappingWidget::GetController() const

diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp b/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp
@@ -216,7 +216,7 @@ void MappingWindow::OnSaveProfilePressed()
   m_controller->SaveConfig(ini.GetOrCreateSection("Profile"));
   ini.Save(profile_path);
 
-  if (m_profiles_combo->currentIndex() == 0)
+  if (m_profiles_combo->currentIndex() == 0 || m_profiles_combo->findText(profile_name) == -1)
   {
     m_profiles_combo->addItem(profile_name, QString::fromStdString(profile_path));
     m_profiles_combo->setCurrentIndex(m_profiles_combo->count() - 1);