[Orxonox-commit 184] r2859 - branches/gui/src/core

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-03-27 15:04:24 +0000 (Fri, 27 Mar 2009)
New Revision: 2859

Modified:
   branches/gui/src/core/Core.cc
Log:
Infinite loop bugfix if orxonox_dev_build.keep_me is missing.

Modified: branches/gui/src/core/Core.cc
===================================================================
--- branches/gui/src/core/Core.cc	2009-03-26 20:45:23 UTC (rev 2858)
+++ branches/gui/src/core/Core.cc	2009-03-27 15:04:24 UTC (rev 2859)
@@ -488,7 +488,7 @@
             // Also set the root path
             boost::filesystem::path relativeExecutablePath(ORXONOX_RUNTIME_INSTALL_PATH);
             rootPath_g = executablePath_g;
-            while (!boost::filesystem::equivalent(rootPath_g / relativeExecutablePath, executablePath_g) || rootPath_g.empty())
+            while (!boost::filesystem::equivalent(rootPath_g / relativeExecutablePath, executablePath_g) && !rootPath_g.empty())
                 rootPath_g = rootPath_g.branch_path();
             if (rootPath_g.empty())
                 ThrowException(General, "Could not derive a root directory. Might the binary installation directory contain '..' when taken relative to the installation prefix path?");