With this change, backends are now responsible for instantiating their OSystem class before calling scummvm_main (Note: PalmOS and Symbian are not yet converted, and won't work currently)

svn-id: r21557

1 files changed, 5 insertions, 4 deletions

diff --git a/base/main.cpp b/base/main.cpp
index 0a4a7b670c..4baa6a6ca4 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -275,6 +275,11 @@ extern "C" int scummvm_main(int argc, char *argv[]) {
 	char *s=NULL;//argv[1]; SumthinWicked says: cannot assume that argv!=NULL here! eg. Symbian's CEBasicAppUI::SDLStartL() calls as main(0,NULL), if you want to change plz #ifdef __SYMBIAN32__
 	bool running = true;
 
+	// Verify that the backend has been initialised (i.e. g_system has been set).
+	assert(g_system);
+	OSystem &system = *g_system;
+
+
 	// Quick preparse of command-line, looking for alt configfile path
 	for (int i = argc - 1; i >= 1; i--) {
 		s = argv[i];
@@ -342,10 +347,6 @@ extern "C" int scummvm_main(int argc, char *argv[]) {
 	GUI::Actions::init(detector);
 #endif
 
-	// Ensure the system object exists (it may have already been created
-	// at an earlier point, though!)
-	OSystem &system = OSystem::instance();
-
 	detector.parseCommandLine(argc, argv);
 
 #ifdef PALMOS_68K