Changeset 8271 for code/branches/kicklib/src/libraries/core/PathConfig.cc

Timestamp:

Apr 20, 2011, 12:10:36 AM (13 years ago)

Author:

rgrieder

Message:

Fixed PATH fiddling for module/plugin loading.

File:

• code/branches/kicklib/src/libraries/core/PathConfig.cc (modified) (1 diff)

code/branches/kicklib/src/libraries/core/PathConfig.cc

@@ -260 +260 @@
         size_t moduleextensionlength = moduleextension.size();
 
+#ifdef ORXONOX_PLATFORM_WINDOWS
         // Add that path to the PATH variable in case a module depends on another one
-        std::string pathVariable(getenv("PATH"));
-        putenv(const_cast<char*>(("PATH=" + pathVariable + ';' + modulePath_.BF_NATIVE_STRING()).c_str()));
+        const char* currentPATH = getenv("PATH");
+        std::string newPATH = modulePath_.BF_NATIVE_STRING();
+        if (currentPATH != NULL)
+            newPATH = std::string(currentPATH) + ';' + newPATH;
+        putenv(const_cast<char*>(("PATH=" + newPATH).c_str()));
+#endif
 
         // Make sure the path exists, otherwise don't load modules