Changeset 4239 for trunk/console

Timestamp:

09/30/05 16:03:13 (3 years ago)

Author:

emostar

Message:

Fix a crash of the console plugin crashing if you hit tab too many times without typeing anything.

If we expect a user, and the user hits tab without enteryting anything, show all users. This might suck..

Location:

trunk/console/src

Files:

• console.cpp (modified) (3 diffs)
• console_tab.cpp (modified) (2 diffs)

trunk/console/src/console.cpp

@@ -1217 +1217 @@
       }
 
+      // If we haven't typed anything, why should we tab?
       if (!nPos)
         break;
@@ -1286 +1287 @@
 
       if (sTabCompletion.vszPartialMatch.size() == 1)
-      { // Only one match
+      {
+        // Only one match
         // Check if there is a space in the match
         if (strchr(szMatch, ' ') != NULL)
@@ -1304 +1306 @@
       }
       else
-      { // Multiple matches
+      { 
+        if (szMatch == 0) break;
+        // Multiple matches
         Beep();
         // Check if there is a space in the match

trunk/console/src/console_tab.cpp

@@ -74 +74 @@
         FOR_EACH_USER_CONTINUE
 
-      if (strncasecmp(_szPartialMatch, pUser->GetAlias(), nLen) == 0)
+      if (nLen == 0 || strncasecmp(_szPartialMatch, pUser->GetAlias(), nLen) == 0)
       {
         if (szMatch == 0)
@@ -93 +93 @@
     FOR_EACH_USER_END
 
+/* This is commented, so we get a list of every user if the user hits tab 
+   and hasn't typed anything. This might suck...
     if (nLen == 0)
       _sTabCompletion.szPartialMatch = 0;
     else
       _sTabCompletion.szPartialMatch = szMatch;
+*/
   }
 /*  else // Sub command time