Changeset 9840 for code/branches

Timestamp:

Dec 2, 2013, 2:38:52 PM (11 years ago)

Author:

georgr

Message:

made two things static to fix everything

File:

• code/branches/wiimote/src/libraries/core/input/InputManager.cc (modified) (2 diffs)

code/branches/wiimote/src/libraries/core/input/InputManager.cc

@@ -228 +228 @@
     {
 
-        CWii wii; // Defaults to 4 remotes
+
+
+        static CWii wii; // Defaults to 4 remotes; static because else it will get deleted during InternalReload
         std::vector< ::CWiimote>::iterator i;
         int reloadWiimotes = 0;
@@ -234 +236 @@
 
         // Find and connect to the wiimotes
-        std::vector<CWiimote>& wiimotes = wii.FindAndConnect(10);
+        static std::vector<CWiimote>& wiimotes = wii.FindAndConnect(10); //CWiimotes are kept in here in case of InternalReload calls
         if (!wiimotes.size())
         {