Changeset 6166 for code/branches/presentation2/src/libraries/core/CommandExecutor.cc

Timestamp:

Nov 26, 2009, 6:49:35 PM (14 years ago)

Author:

rgrieder

Message:

Fixed auto completion:

• When completing for instance "KeyBin", it was extended to "keybinder" instead of "KeyBinder" ("KeyBinderManager" has the same casing)
• "keybinder " didn't show the config values for the KeyBinder (occurred often because of the issue above)

File:

• code/branches/presentation2/src/libraries/core/CommandExecutor.cc (modified) (1 diff)

code/branches/presentation2/src/libraries/core/CommandExecutor.cc

@@ -637 +637 @@
             for (unsigned int i = 0; true; i++)
             {
+                char tempComparable = 0;
                 char temp = 0;
                 for (ArgumentCompletionList::const_iterator it = list.begin(); it != list.end(); ++it)
                 {
-                    std::string argument = (*it).getComparable();
+                    std::string argumentComparable = (*it).getComparable();
+                    std::string argument = (*it).getString();
                     if (argument.size() > i)
                     {
                         if (it == list.begin())
                         {
+                            tempComparable = argumentComparable[i];
                             temp = argument[i];
                         }
                         else
                         {
-                            if (temp != argument[i])
+                            if (tempComparable != argumentComparable[i])
                                 return output;
+                            else if (temp != argument[i])
+                                temp = tempComparable;
                         }
                     }