diff --git a/src/nxemu/settings/ui_identifiers.h b/src/nxemu/settings/ui_identifiers.h
index f64de80e..35b7e54f 100644
--- a/src/nxemu/settings/ui_identifiers.h
+++ b/src/nxemu/settings/ui_identifiers.h
@@ -6,5 +6,6 @@ constexpr const char * RecentFiles = "nxui:RecentFiles";
constexpr const char * GameDirectories = "nxui:GameDirectories";
constexpr const char * MyGameIconSize = "nxui:MyGameIconSize";
constexpr const char * Hotkeys = "nxui:Hotkeys";
+constexpr const char * ConfirmBeforeStopping = "nxui:ConfirmBeforeStopping";
} // namespace NXUISetting
\ No newline at end of file
diff --git a/src/nxemu/settings/ui_settings.cpp b/src/nxemu/settings/ui_settings.cpp
index cdbc3eea..d713245c 100644
--- a/src/nxemu/settings/ui_settings.cpp
+++ b/src/nxemu/settings/ui_settings.cpp
@@ -99,7 +99,8 @@ namespace
{nullptr, "PerformVulkanCheck", &uiSettings.performVulkanCheck, true},
{nullptr, nullptr, &uiSettings.hasBrokenVulkan, false},
{nullptr, nullptr, &uiSettings.enableAllControllers, false},
- {nullptr, "View\\StartGamesInFullscreen", &uiSettings.startGamesInFullscreen, false},
+ {nullptr, "StartGamesInFullscreen", &uiSettings.startGamesInFullscreen, false},
+ {NXUISetting::ConfirmBeforeStopping, "ConfirmBeforeStopping", &uiSettings.confirmBeforeStopping, true},
{NXUISetting::Hotkeys, "Hotkeys", &uiSettings.hotkeys, &g_defaultHotkeys},
};
diff --git a/src/nxemu/settings/ui_settings.h b/src/nxemu/settings/ui_settings.h
index 8d4d76a1..c69285a6 100644
--- a/src/nxemu/settings/ui_settings.h
+++ b/src/nxemu/settings/ui_settings.h
@@ -20,6 +20,7 @@ struct UISettings
bool hasBrokenVulkan;
bool enableAllControllers;
bool startGamesInFullscreen;
+ bool confirmBeforeStopping;
HotkeyMap hotkeys;
};
diff --git a/src/nxemu/user_interface/sciter_main_window.cpp b/src/nxemu/user_interface/sciter_main_window.cpp
index 67942b06..7c04373c 100644
--- a/src/nxemu/user_interface/sciter_main_window.cpp
+++ b/src/nxemu/user_interface/sciter_main_window.cpp
@@ -453,6 +453,7 @@ bool SciterMainWindow::Show()
m_rootElement = m_window->GetRootElement();
m_sciterUI.AttachHandler(m_rootElement, IID_IKEYSINK, (IKeySink *)this);
m_sciterUI.AttachHandler(m_rootElement, IID_EVENTSINK, (IEventSink *)this);
+ m_window->OnCloseSinkAdd(this);
m_window->OnDestroySinkAdd(this);
m_window->CenterWindow();
SetCaption(m_windowTitle);
@@ -1054,8 +1055,29 @@ void SciterMainWindow::FirmwareInstallTotalChanged(const char * /*setting*/, voi
}
}
+bool SciterMainWindow::ConfirmCloseEmulator()
+{
+ if (!m_emulationRunning || !uiSettings.confirmBeforeStopping)
+ {
+ return true;
+ }
+
+ const char * msg = "Are you sure you want to exit the emulator?\n\nAny unsaved progress will be lost.";
+ bool exitLocked = m_modules.IsValid() && m_modules.Modules().OperatingSystem().GetExitLocked();
+ if (exitLocked)
+ {
+ msg = "The currently running application has requested NxEmu to not exit.\n\nWould you like to bypass this and close the emulator anyway?";
+ }
+
+ return g_notify->Query(msg, "NxEmu - Exit Emulator?") == NotificationResponse::Yes;
+}
+
void SciterMainWindow::OnFileExit()
{
+ if (!ConfirmCloseEmulator())
+ {
+ return;
+ }
m_sciterUI.Stop();
}
@@ -1065,6 +1087,20 @@ void SciterMainWindow::OnStopGame()
{
return;
}
+ if (uiSettings.confirmBeforeStopping)
+ {
+ const char * msg = "Are you sure you want to stop the emulation?\n\nAny unsaved progress will be lost.";
+ bool exitLocked = m_modules.IsValid() && m_modules.Modules().OperatingSystem().GetExitLocked();
+ if (exitLocked)
+ {
+ msg = "The currently running application has requested NxEmu to not exit.\n\nWould you like to bypass this and stop emulation anyway?";
+ }
+
+ if (g_notify->Query(msg, "NxEmu - Stop Emulation") == NotificationResponse::No)
+ {
+ return;
+ }
+ }
AllowOSSleep();
SettingsStore & settings = SettingsStore::GetInstance();
settings.SetBool(NXCoreSetting::EmulationRunning, false);
@@ -1272,6 +1308,11 @@ void SciterMainWindow::OnWindowDestroy(HWINDOW /*hWnd*/)
m_sciterUI.Stop();
}
+bool SciterMainWindow::OnWindowCloseRequest(HWINDOW hWnd)
+{
+ return ConfirmCloseEmulator();
+}
+
void SciterMainWindow::OnMenuItem(int32_t id, SCITER_ELEMENT /*item*/)
{
OnGuiAction(static_cast