Changeset 1263 for code/branches/merge/src/orxonox/Main.cc

Timestamp:

May 13, 2008, 3:45:19 PM (17 years ago)

Author:

rgrieder

Message:

• merged ogre branch into merge branch

File:

• code/branches/merge/src/orxonox/Main.cc (modified) (1 diff)

code/branches/merge/src/orxonox/Main.cc

@@ -78 +78 @@
     Orxonox* orx = Orxonox::getSingleton();
 
+    bool res = false;
 #if ORXONOX_PLATFORM == ORXONOX_PLATFORM_APPLE
-    orx->init(argc, argv, macBundlePath());
+    res = orx->init(argc, argv, macBundlePath());
 #else
-    orx->init(argc, argv, "");
+    res = orx->init(argc, argv, "");
 #endif
 
-    orx->start();
+    if (res)
+      orx->start();
     orx->destroySingleton();
   /*}