aboutsummaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorJames Brown2004-10-10 16:31:15 +0000
committerJames Brown2004-10-10 16:31:15 +0000
commit09c0855f9ad4631f87f0d5d40ded3e35ae978e38 (patch)
tree52937c5dbd0bb65b5d688a910566765b2ed46991 /base
parentbb5ed19d3ec61adc67cdc1febb8c82c26aa04fed (diff)
downloadscummvm-rg350-09c0855f9ad4631f87f0d5d40ded3e35ae978e38.tar.gz
scummvm-rg350-09c0855f9ad4631f87f0d5d40ded3e35ae978e38.tar.bz2
scummvm-rg350-09c0855f9ad4631f87f0d5d40ded3e35ae978e38.zip
Reenable persistant launcher, in order to encourage some debugging ;)
svn-id: r15510
Diffstat (limited to 'base')
-rw-r--r--base/main.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/base/main.cpp b/base/main.cpp
index 68ca73a4be..c6700d89cd 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -375,10 +375,10 @@ extern "C" int scummvm_main(GameDetector &detector, int argc, char *argv[]) {
if (detector._targetName.isEmpty())
launcherDialog(detector, system);
- // Uncomment the while loop, and the launcherDialog call, to allow
- // returning to the Launcher after an engine quit. Disabled currently
- // as it probably leaks memory like a sieve.
- //while(1) {
+ // FIXME: We're now looping the launcher. This, of course, doesn't
+ // work as well as it should. In theory everything should be destroyed
+ // cleanly, so this is now enabled to encourage people to fix bits :)
+ while(1) {
// Verify the given game name is a valid supported game
if (detector.detectMain()) {
// Unload all plugins not needed for this game,
@@ -389,9 +389,9 @@ extern "C" int scummvm_main(GameDetector &detector, int argc, char *argv[]) {
// PluginManager::instance().unloadPlugins();
// PluginManager::instance().loadPlugins();
- // launcherDialog(detector, system);
+ launcherDialog(detector, system);
}
- //}
+ }
// ...and quit (the return 0 should never be reached)
delete g_timer;