Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3269 for code/branches


Ignore:
Timestamp:
Jul 1, 2009, 9:24:57 PM (15 years ago)
Author:
rgrieder
Message:

Bugfix for InputManager reloading.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • code/branches/core4/src/core/input/KeyBinder.cc

    r3265 r3269  
    9696        }
    9797
    98         // Get a new ConfigFileType from the ConfigFileManager
    99         this->configFile_ = ConfigFileManager::getInstance().getNewConfigFileType();
     98        // We might not even load any bindings at all (KeyDetector for instance)
     99        this->configFile_ = ConfigFileType::NoType;
    100100
    101101        // initialise joy sticks separatly to allow for reloading
     
    249249        if (filename.empty())
    250250            return;
     251
     252        if (this->configFile_ == ConfigFileType::NoType)
     253        {
     254            // Get a new ConfigFileType from the ConfigFileManager
     255            this->configFile_ = ConfigFileManager::getInstance().getNewConfigFileType();
     256        }
    251257
    252258        ConfigFileManager::getInstance().setFilename(this->configFile_, filename);
Note: See TracChangeset for help on using the changeset viewer.