r715 - trunk

lordhavoc at icculus.org lordhavoc at icculus.org
Fri May 12 07:03:18 EDT 2006


Author: lordhavoc
Date: 2006-05-12 07:03:18 -0400 (Fri, 12 May 2006)
New Revision: 715

Modified:
   trunk/console.c
Log:
avoid an assertion failure when cursoring up/down if command history is empty


Modified: trunk/console.c
===================================================================
--- trunk/console.c	2006-05-12 08:36:47 UTC (rev 714)
+++ trunk/console.c	2006-05-12 11:03:18 UTC (rev 715)
@@ -156,7 +156,7 @@
 	(Shell_Symbol_Callback) Console_Toggle
 };
 
-static void Console_Shell_Echo(void) 
+static void Console_Shell_Echo(void)
 {
 	NUint i;
 	Console_Printf( "%s", Shell_Callback_GetArg( 1 ) );
@@ -174,7 +174,7 @@
 	(Shell_Symbol_Callback) Console_Shell_Echo
 };
 
-static void Console_Shell_Print(void) 
+static void Console_Shell_Print(void)
 {
 	NUint i;
 	Console_Printf( "%s", Shell_Callback_GetArg( 1 ) );
@@ -493,6 +493,8 @@
 
 void Console_Cursor_Up(void)
 {
+	if (!Console.numcommandhistorymessages)
+		return;
 	if (Console.commandindex == 0)
 		return;
 	Console.commandindex--;
@@ -502,6 +504,8 @@
 
 void Console_Cursor_Down(void)
 {
+	if (!Console.numcommandhistorymessages)
+		return;
 	if (Console.commandindex < Console.numcommandhistorymessages - 1) {
 		Console.commandindex++;
 		String_Set(&Console.command, Console.zone, Console_GetCommandHistoryLine(Console.commandindex));




More information about the neither-commits mailing list