From c67b91437673e070119c782a33b070083c3d7f27 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sun, 22 Jun 2008 10:26:18 +0000
Subject: Disabled return to launcher on trunk again

svn-id: r32745
---
 base/main.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/base/main.cpp b/base/main.cpp
index dbf740c2ec..88d9f3bab5 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -228,9 +228,7 @@ static int runGame(const EnginePlugin *plugin, OSystem &system, const Common::St
 	// Reset the file/directory mappings
 	Common::File::resetDefaultDirectories();
 
-
-
-    return 1;   // Changing from return 0, in order to return to launcher
+	return 0;
 }
 
 
@@ -278,6 +276,7 @@ extern "C" int scummvm_main(int argc, char *argv[]) {
 
 	// Load the plugins.
 	PluginManager::instance().loadPlugins();
+	EngineMan.getPlugins();
 
 	// Process the remaining command line settings. Must be done after the
 	// config file and the plugins have been loaded.
-- 
cgit v1.2.3