Changeset 6007 for code/branches/console/src/libraries/core

Timestamp:

Oct 30, 2009, 5:26:28 PM (15 years ago)

Author:

rgrieder

Message:

Fixed IOConsole partly and fixed two problems in PathConfig and OutputHandler

Location:

code/branches/console/src/libraries/core

Files:

• IOConsole.cc (modified) (2 diffs)
• IOConsole.h (modified) (2 diffs)
• PathConfig.cc (modified) (1 diff)

code/branches/console/src/libraries/core/IOConsole.cc

@@ -54 +54 @@
 #ifdef ORXONOX_PLATFORM_UNIX
 
-    termios* IOConsole::originalTerminalSettings_;
-
     namespace EscapeMode
     {
@@ -69 +67 @@
         : shell_(new Shell("IOConsole", false))
         , buffer_(shell_->getInputBuffer())
+        , originalTerminalSettings_(new termios())
         , bStatusPrinted_(false)
     {
-        this->originalTerminalSettings_ = new termios();
         this->setTerminalMode();
         this->shell_->registerListener(this);

code/branches/console/src/libraries/core/IOConsole.h

@@ -55 +55 @@
 
         void setTerminalMode();
-        static void resetTerminalMode();
+        void resetTerminalMode();
         int getTerminalSize(int* x, int* y);
 
@@ -72 +72 @@
         Shell*                  shell_;
         InputBuffer*            buffer_;
-        static termios*         originalTerminalSettings_;
+        termios*                originalTerminalSettings_;
         bool                    bPrintStatusLine_;
         bool                    bStatusPrinted_;

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

@@ -263 +263 @@
         putenv(const_cast<char*>(("PATH=" + pathVariable + ";" + modulePath_.string()).c_str()));
 
+        // Make sure the path exists, otherwise don't load modules
+        if (!boost::filesystem::exists(modulePath_))
+            return modulePaths;
+
         boost::filesystem::directory_iterator file(modulePath_);
         boost::filesystem::directory_iterator end;