citra-emu
/
citra
Archived
1
0
Fork 0
Code

Merge pull request #1352 from LittleWhite-tb/exit_check 

Add check before closure when emulation is running
This commit is contained in:
bunnei 2016-02-26 08:36:33 -05:00
parent 2b00bdec1f 973a6c40da
commit c28a48aa02
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/citra_qt/main.cpp
View File

@ -171,6 +171,8 @@ GMainWindow::GMainWindow() : emu_thread(nullptr)
} }
UpdateRecentFiles(); UpdateRecentFiles();
confirm_before_closing = settings.value("confirmClose", true).toBool();
// Setup connections // Setup connections
connect(game_list, SIGNAL(GameChosen(QString)), this, SLOT(OnGameListLoadFile(QString))); connect(game_list, SIGNAL(GameChosen(QString)), this, SLOT(OnGameListLoadFile(QString)));
connect(ui.action_Load_File, SIGNAL(triggered()), this, SLOT(OnMenuLoadFile())); connect(ui.action_Load_File, SIGNAL(triggered()), this, SLOT(OnMenuLoadFile()));
@ -497,7 +499,22 @@ void GMainWindow::OnConfigure() {
//GControllerConfigDialog* dialog = new GControllerConfigDialog(controller_ports, this); //GControllerConfigDialog* dialog = new GControllerConfigDialog(controller_ports, this);
} }
bool GMainWindow::ConfirmClose() {
if (emu_thread == nullptr || !confirm_before_closing)
return true;
auto answer = QMessageBox::question(this, tr("Citra"),
tr("Are you sure you want to close Citra?"),
QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
return answer != QMessageBox::No;
}
void GMainWindow::closeEvent(QCloseEvent* event) { void GMainWindow::closeEvent(QCloseEvent* event) {
if (!ConfirmClose()) {
event->ignore();
return;
}
// Save window layout // Save window layout
QSettings settings(QSettings::IniFormat, QSettings::UserScope, "Citra team", "Citra"); QSettings settings(QSettings::IniFormat, QSettings::UserScope, "Citra team", "Citra");
@ -512,6 +529,7 @@ void GMainWindow::closeEvent(QCloseEvent* event) {
settings.setValue("singleWindowMode", ui.action_Single_Window_Mode->isChecked()); settings.setValue("singleWindowMode", ui.action_Single_Window_Mode->isChecked());
settings.setValue("displayTitleBars", ui.actionDisplay_widget_title_bars->isChecked()); settings.setValue("displayTitleBars", ui.actionDisplay_widget_title_bars->isChecked());
settings.setValue("firstStart", false); settings.setValue("firstStart", false);
settings.setValue("confirmClose", confirm_before_closing);
game_list->SaveInterfaceLayout(settings); game_list->SaveInterfaceLayout(settings);
SaveHotkeys(settings); SaveHotkeys(settings);

8
src/citra_qt/main.h
View File

@ -82,6 +82,13 @@ private:
*/ */
void UpdateRecentFiles(); void UpdateRecentFiles();
/**
* If the emulation is running,
* asks the user if he really want to close the emulator
*
* @return true if the user confirmed
*/
bool ConfirmClose();
void closeEvent(QCloseEvent* event) override; void closeEvent(QCloseEvent* event) override;
private slots: private slots:
@ -122,6 +129,7 @@ private:
GPUCommandListWidget* graphicsCommandsWidget; GPUCommandListWidget* graphicsCommandsWidget;
QAction* actions_recent_files[max_recent_files_item]; QAction* actions_recent_files[max_recent_files_item];
bool confirm_before_closing;
}; };
#endif // _CITRA_QT_MAIN_HXX_ #endif // _CITRA_QT_MAIN_HXX_