Changeset 7817

Timestamp:

Dec 26, 2010, 5:26:58 PM (14 years ago)

Author:

rgrieder

Message:

Merged r7816 from sandbox_qt.

File:

• code/forks/pch_analyser/src/orxonox/Main.cc (modified) (3 diffs)

code/forks/pch_analyser/src/orxonox/Main.cc

@@ -36 +36 @@
 #include "Main.h"
 
+#include <memory>
 #include <QApplication>
 #include <QCoreApplication>
 
+#ifdef ORXONOX_PLATFORM_WINDOWS
+#  include <windows.h>
+#endif
+
 #include "util/Debug.h"
+#include "util/Exception.h"
 #include "core/CommandLineParser.h"
 #include "core/Core.h"
@@ -57 +63 @@
         QApplication app(argc, argv);
 
-        QStringList arguments = QCoreApplication::arguments();
-        if (!arguments.value(0).isEmpty() && arguments.value(0)[0] != '-')
-            arguments.pop_front(); // Remove application path
-        Core core(arguments.join(" ").toStdString());
+        std::auto_ptr<Core> core;
+        try
+        {
+            QStringList arguments = QCoreApplication::arguments();
+            if (!arguments.value(0).isEmpty() && arguments.value(0)[0] != '-')
+                arguments.pop_front(); // Remove application path
+            core.reset(new Core(arguments.join(" ").toStdString()));
+        }
+        catch (const Exception& ex)
+        {
+            COUT(0) << "Exception: " << ex.getDescription() << endl;
+#ifdef ORXONOX_PLATFORM_WINDOWS
+            MessageBox(NULL, ex.getDescription().c_str(), "Exception", MB_ICONERROR);
+#endif
+            return 1;
+        }
 
         QCoreApplication::setOrganizationName("Orxonox");
@@ -71 +89 @@
         QCoreApplication::setApplicationVersion(versionString);
 
-        parse();
+        // Define library path
+        // Note: May not work (untested) because QApplication was already created.
+        // However doing the beforehand is difficult because the Core is required.
+        QStringList libraryPaths = QCoreApplication::libraryPaths();
+        libraryPaths.prepend(PathConfig::getExecutablePath().path() + "/plugins");
+        QCoreApplication::setLibraryPaths(libraryPaths);
 
-        return 0;
+        try
+        {
+            parse();
+            return 0;
+        }
+        catch (const Exception& ex)
+        {
+            COUT(0) << "Exception: " << ex.getDescription() << endl;
+#ifdef ORXONOX_PLATFORM_WINDOWS
+            MessageBox(NULL, ex.getDescription().c_str(), "Exception", MB_ICONERROR);
+#endif
+            return 1;
+        }
     }
 }