Changeset 7868

Timestamp:

Feb 12, 2011, 4:28:53 PM (14 years ago)

Author:

landauf

Message:

use exit() instead of abort() if the ogre config dialog was canceled by the user. avoids error/crash message.

Location:

code/trunk/src/libraries/core

Files:

• Core.cc (modified) (2 diffs)
• GraphicsManager.cc (modified) (1 diff)

code/trunk/src/libraries/core/Core.cc

@@ -251 +251 @@
             graphicsManager_->upgradeToGraphics();
         }
+        catch (const InitialisationFailedException& e)
+        {
+            // Exit the application if the Ogre config dialog was canceled
+            COUT(1) << Exception::handleMessage() << std::endl;
+            exit(EXIT_FAILURE);
+        }
         catch (...)
         {
@@ -259 +265 @@
             // and reloaded between throw and catch (access violation in MSVC).
             // That's why we abort completely and only display the exception.
-            COUT(0) << "An exception occurred during upgrade to graphics. "
+            COUT(1) << "An exception occurred during upgrade to graphics. "
                     << "That is unrecoverable. The message was:" << endl
                     << Exception::handleMessage() << endl;

code/trunk/src/libraries/core/GraphicsManager.cc

@@ -305 +305 @@
         if (!ogreRoot_->restoreConfig())
             if (!ogreRoot_->showConfigDialog())
-                ThrowException(InitialisationFailed, "OGRE graphics configuration dialogue failed.");
+                ThrowException(InitialisationFailed, "OGRE graphics configuration dialogue canceled.");
 
         CCOUT(4) << "Creating render window" << std::endl;