From 4518f73f920ee5d564e266032cfbcde87165c372 Mon Sep 17 00:00:00 2001 From: Thierry Crozat Date: Wed, 9 Dec 2020 22:11:08 +0000 Subject: [PATCH] BASE: Remove FORCE_RETURN_TO_LAUNCHER define This was only used by the ps2 backend, and that backend no longer exists. Also now backends that want to force RTL should use the kFeatureNoQuit OSystem feature instead. --- base/main.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/base/main.cpp b/base/main.cpp index cd50b0b1729..d2b62123ed8 100644 --- a/base/main.cpp +++ b/base/main.cpp @@ -620,11 +620,10 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) { } // Quit unless an error occurred, or Return to launcher was requested -#ifndef FORCE_RETURN_TO_LAUNCHER if (result.getCode() == Common::kNoError && !g_system->getEventManager()->shouldReturnToLauncher() && !g_system->hasFeature(OSystem::kFeatureNoQuit) && !ConfMan.getBool("gui_return_to_launcher_at_exit")) break; -#endif + // Reset the return to launcher and quit flags in case we want to load another engine g_system->getEventManager()->resetReturnToLauncher(); g_system->getEventManager()->resetQuit();