ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Fix game properties staying open after closing main window

This commit is contained in:
Connor McLaughlin 2022-06-28 21:41:24 +10:00 committed by refractionpcsx2
parent b6f748ad8f
commit 9f99e88c92
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pcsx2-qt/Settings/SettingsDialog.cpp
View File

@ -24,6 +24,7 @@
#include "pcsx2/Frontend/INISettingsInterface.h" #include "pcsx2/Frontend/INISettingsInterface.h"
#include "EmuThread.h" #include "EmuThread.h"
#include "MainWindow.h"
#include "QtHost.h" #include "QtHost.h"
#include "QtUtils.h" #include "QtUtils.h"
#include "SettingsDialog.h" #include "SettingsDialog.h"
@ -55,8 +56,8 @@ SettingsDialog::SettingsDialog(QWidget* parent)
setupUi(nullptr); setupUi(nullptr);
} }
SettingsDialog::SettingsDialog(std::unique_ptr<SettingsInterface> sif, const GameList::Entry* game, u32 game_crc) SettingsDialog::SettingsDialog(QWidget* parent, std::unique_ptr<SettingsInterface> sif, const GameList::Entry* game, u32 game_crc)
: QDialog() : QDialog(parent)
, m_sif(std::move(sif)) , m_sif(std::move(sif))
, m_game_crc(game_crc) , m_game_crc(game_crc)
{ {
@ -446,7 +447,8 @@ void SettingsDialog::openGamePropertiesDialog(const GameList::Entry* game, const
.arg(game ? QtUtils::StringViewToQString(game->title) : QStringLiteral("<UNKNOWN>")) .arg(game ? QtUtils::StringViewToQString(game->title) : QStringLiteral("<UNKNOWN>"))
.arg(QtUtils::StringViewToQString(Path::GetFileName(sif->GetFileName())))); .arg(QtUtils::StringViewToQString(Path::GetFileName(sif->GetFileName()))));
SettingsDialog* dialog = new SettingsDialog(std::move(sif), game, crc); SettingsDialog* dialog = new SettingsDialog(g_main_window, std::move(sif), game, crc);
dialog->setWindowTitle(window_title); dialog->setWindowTitle(window_title);
dialog->setModal(false);
dialog->show(); dialog->show();
} }

2
pcsx2-qt/Settings/SettingsDialog.h
View File

@ -48,7 +48,7 @@ class SettingsDialog final : public QDialog
public: public:
explicit SettingsDialog(QWidget* parent); explicit SettingsDialog(QWidget* parent);
SettingsDialog(std::unique_ptr<SettingsInterface> sif, const GameList::Entry* game, u32 game_crc); SettingsDialog(QWidget* parent, std::unique_ptr<SettingsInterface> sif, const GameList::Entry* game, u32 game_crc);
~SettingsDialog(); ~SettingsDialog();
static void openGamePropertiesDialog(const GameList::Entry* game, const std::string_view& serial, u32 crc); static void openGamePropertiesDialog(const GameList::Entry* game, const std::string_view& serial, u32 crc);