Qt: Fix game properties dialogs keeping app open

stenzek · Dec 18, 2023 · 2d4191f · 2d4191f
1 parent 8842a46
commit 2d4191f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/src/duckstation-qt/mainwindow.cpp b/src/duckstation-qt/mainwindow.cpp
@@ -770,6 +770,8 @@ void MainWindow::destroySubWindows()
     m_settings_window->deleteLater();
     m_settings_window = nullptr;
   }
+
+  SettingsWindow::closeGamePropertiesDialogs();
 }
 
 void MainWindow::populateGameListContextMenu(const GameList::Entry* entry, QWidget* parent_window, QMenu* menu)

diff --git a/src/duckstation-qt/settingswindow.cpp b/src/duckstation-qt/settingswindow.cpp
@@ -520,3 +520,12 @@ void SettingsWindow::openGamePropertiesDialog(const std::string& path, const std
   dialog->setWindowTitle(window_title);
   dialog->show();
 }
+
+void SettingsWindow::closeGamePropertiesDialogs()
+{
+  for (SettingsWindow* dialog : s_open_game_properties_dialogs)
+  {
+    dialog->close();
+    dialog->deleteLater();
+  }
+}
diff --git a/src/duckstation-qt/settingswindow.h b/src/duckstation-qt/settingswindow.h
@@ -44,6 +44,7 @@ class SettingsWindow final : public QWidget
   ~SettingsWindow();
 
   static void openGamePropertiesDialog(const std::string& path, const std::string& serial, DiscRegion region);
+  static void closeGamePropertiesDialogs();
 
   ALWAYS_INLINE bool isPerGameSettings() const { return static_cast<bool>(m_sif); }
   ALWAYS_INLINE SettingsInterface* getSettingsInterface() const { return m_sif.get(); }