libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-19 08:25:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make ESC key work in the launcher

Browse Source 
svn-id: r16323
This commit is contained in:
Max Horn 2004-12-25 22:13:44 +00:00
parent ffbbef6f31
commit 4a0c1b86f7
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
base/main.cpp
View File

@ -184,7 +184,7 @@ static void do_memory_test(void) {
#endif
static int launcherDialog(GameDetector &detector, OSystem *system) {
static bool launcherDialog(GameDetector &detector, OSystem *system) {
system->beginGFXTransaction();
// Set the user specified graphics mode (if any).
@ -232,7 +232,7 @@ static int launcherDialog(GameDetector &detector, OSystem *system) {
#else
GUI::LauncherDialog dlg(detector);
#endif
return dlg.runModal();
return (dlg.runModal() != -1);
}
static int runGame(GameDetector &detector, OSystem *system) {
@ -377,7 +377,7 @@ extern "C" int scummvm_main(GameDetector &detector, int argc, char *argv[]) {
// Unless a game was specified, show the launcher dialog
if (detector._targetName.isEmpty())
launcherDialog(detector, system);
running = launcherDialog(detector, system);
// FIXME: We're now looping the launcher. This, of course, doesn't
// work as well as it should. In theory everything should be destroyed
@ -403,7 +403,7 @@ extern "C" int scummvm_main(GameDetector &detector, int argc, char *argv[]) {
PluginManager::instance().loadPlugins();
}
launcherDialog(detector, system);
running = launcherDialog(detector, system);
}
// ...and quit (the return 0 should never be reached)

2
gui/launcher.cpp
View File

@ -673,8 +673,8 @@ void LauncherDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 dat
updateButtons();
break;
case kQuitCmd:
setResult(-1);
close();
g_system->quit();
break;
default:
Dialog::handleCommand(sender, cmd, data);