r386 - trunk

[DONOTREPLY at icculus.org]

Author: icculus
Date: 2007-12-15 21:35:56 -0500 (Sat, 15 Dec 2007)
New Revision: 386

Modified:
   trunk/gui_stdio.c
Log:
In the stdio ui, don't prompt the user to hit enter if they just paged through
 a readme/eula ... if there's no actual choice, just go on.


Modified: trunk/gui_stdio.c
===================================================================
--- trunk/gui_stdio.c	2007-12-05 11:12:35 UTC (rev 385)
+++ trunk/gui_stdio.c	2007-12-16 02:35:56 UTC (rev 386)
@@ -390,8 +390,9 @@
     if (failed)  // We're not Unix, or none of the pagers worked?
         dumb_pager(name, data, datalen);
 
-    // Put up the "hit enter to continue (or 'back' to go back)" prompt.
-    if (readstr(NULL, buf, sizeof (buf), can_back, true) >= 0)
+    // Put up the "hit enter to continue (or 'back' to go back)" prompt,
+    //  but only if there's an choice to be made here.
+    if ((!can_back) || (readstr(NULL, buf, sizeof (buf), can_back, true) >= 0))
         retval = 1;
 
     return retval;