midou/citra-shitamoto-network
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a configuration entry to enable/disable the check

Browse Source
This commit is contained in:
LittleWhite 2016-01-13 18:40:41 +01:00
parent c2b210f713
commit 973a6c40da
2 changed files with 10 additions and 9 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()));
@ -498,16 +500,13 @@ void GMainWindow::OnConfigure() {
} }
bool GMainWindow::ConfirmClose() { bool GMainWindow::ConfirmClose() {
if (emu_thread != nullptr) { if (emu_thread == nullptr || !confirm_before_closing)
auto answer = QMessageBox::question(this, tr("Citra"), return true;
tr("Are you sure you want to close Citra?"),
QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
if (answer == QMessageBox::No) { auto answer = QMessageBox::question(this, tr("Citra"),
return false; tr("Are you sure you want to close Citra?"),
} QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
} return answer != QMessageBox::No;
return true;
} }
void GMainWindow::closeEvent(QCloseEvent* event) { void GMainWindow::closeEvent(QCloseEvent* event) {
@ -530,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);

1
src/citra_qt/main.h
View File

@ -129,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_