Changeset 3269 for code/branches/core4/src/core

Timestamp:

Jul 1, 2009, 9:24:57 PM (15 years ago)

Author:

rgrieder

Message:

Bugfix for InputManager reloading.

File:

• code/branches/core4/src/core/input/KeyBinder.cc (modified) (2 diffs)

code/branches/core4/src/core/input/KeyBinder.cc

@@ -96 +96 @@
         }
 
-        // Get a new ConfigFileType from the ConfigFileManager
-        this->configFile_ = ConfigFileManager::getInstance().getNewConfigFileType();
+        // We might not even load any bindings at all (KeyDetector for instance)
+        this->configFile_ = ConfigFileType::NoType;
 
         // initialise joy sticks separatly to allow for reloading
@@ -249 +249 @@
         if (filename.empty())
             return;
+
+        if (this->configFile_ == ConfigFileType::NoType)
+        {
+            // Get a new ConfigFileType from the ConfigFileManager
+            this->configFile_ = ConfigFileManager::getInstance().getNewConfigFileType();
+        }
 
         ConfigFileManager::getInstance().setFilename(this->configFile_, filename);