aboutsummaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorMax Horn2005-04-19 20:22:50 +0000
committerMax Horn2005-04-19 20:22:50 +0000
commit2cfb9322e2e2b59fa2ab311491445ef801d4979a (patch)
treeda6657a42de0b43c7af4d96dfb76d8bd484a5496 /base
parent167d43d9244aa5961fafbc3760dddbc1c04cc028 (diff)
downloadscummvm-rg350-2cfb9322e2e2b59fa2ab311491445ef801d4979a.tar.gz
scummvm-rg350-2cfb9322e2e2b59fa2ab311491445ef801d4979a.tar.bz2
scummvm-rg350-2cfb9322e2e2b59fa2ab311491445ef801d4979a.zip
Added new (optional) OSystem::initBackend() method; this (and its usage) fixes bugs #1160977 and #1184664
svn-id: r17694
Diffstat (limited to 'base')
-rw-r--r--base/main.cpp10
1 files changed, 7 insertions, 3 deletions
diff --git a/base/main.cpp b/base/main.cpp
index 11ea937701..1b9e9495ee 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -368,6 +368,10 @@ extern "C" int main(int argc, char *argv[]) {
// Load the plugins
PluginManager::instance().loadPlugins();
+ // Ensure the system object exists (it may have already been created
+ // at an earlier point, though!)
+ OSystem &system = OSystem::instance();
+
// Parse the command line information
#ifndef _WIN32_WCE
GameDetector detector;
@@ -378,9 +382,9 @@ extern "C" int main(int argc, char *argv[]) {
ArgsFree(argv);
#endif
- // Ensure the system object exists (it may have already been created
- // at an earlier point, though!)
- OSystem &system = OSystem::instance();
+ // Init the backend. Must take place after all config data (including
+ // the command line params) was read.
+ system.initBackend();
// Create the timer services
g_timer = new Timer(&system);