Changeset 1293 for code/trunk/src/orxonox/Main.cc

Timestamp:

May 15, 2008, 5:44:55 PM (16 years ago)

Author:

scheusso

Message:

merged changes from input & camera & network branch into trunk

File:

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

code/trunk/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();
   /*}