Merge branch '12_32_2' of github.com:chrisws/SmallBASIC into 12_32_2

Author: Chris Warren-Smith

src/common/blib.c

@@ -2046,11 +2046,13 @@ void cmd_randomize() {
  * DELAY
  */
 void cmd_delay() {
-  uint32_t ms = par_getint();
+  int32_t ms = par_getint();
   if (prog_error) {
     return;
   }
-  dev_delay(ms);
+  if (ms > 0) {
+    dev_delay(ms);
+  }
 }
 
 /**

src/platform/android/jni/runtime.cpp

@@ -880,7 +880,8 @@ void Runtime::pause(int timeout) {
       delete event;
     }
   } else {
-    uint32_t startTime = dev_get_millisecond_count();
+    int slept;
+    int now = dev_get_millisecond_count();
     while (true) {
       pollEvents(false);
       if (isBreak()) {
@@ -890,8 +891,11 @@ void Runtime::pause(int timeout) {
         processEvent(*event);
         delete event;
       }
-      usleep(1000);
-      if (timeout > 0 && (dev_get_millisecond_count() - startTime) > timeout) {
+      slept = dev_get_millisecond_count() - now;
+      if (timeout - slept > WAIT_INTERVAL) {
+        usleep(WAIT_INTERVAL * 1000);
+      } else {
+        usleep((timeout - slept) * 1000);
         break;
       }
     }

src/platform/console/device.cpp

@@ -444,18 +444,17 @@ int osd_textheight(const char *str) {
 // delay while pumping events
 //
 void dev_delay(uint32_t timeout) {
-  uint32_t slept = 0;
+  uint32_t slept;
   uint32_t now = dev_get_millisecond_count();
   while (1) {
     if (osd_events(0) < 0) {
       break;
     }
-    if (dev_get_millisecond_count() - now > timeout) {
-      break;
-    }
-    usleep(WAIT_INTERVAL * 1000);
-    slept += WAIT_INTERVAL;
-    if (timeout > 0 && slept > timeout) {
+    slept = dev_get_millisecond_count() - now;
+    if (timeout - slept > WAIT_INTERVAL) {
+      usleep(WAIT_INTERVAL * 1000);
+    } else {
+      usleep((timeout - slept) * 1000);
       break;
     }
   }

src/platform/sdl/runtime.cpp

@@ -417,7 +417,8 @@ void Runtime::pause(int timeout) {
       delete event;
     }
   } else {
-    int slept = 0;
+    int slept;
+    int now = dev_get_millisecond_count();
     while (true) {
       pollEvents(false);
       if (isBreak()) {
@@ -427,9 +428,11 @@ void Runtime::pause(int timeout) {
         processEvent(*event);
         delete event;
       }
-      usleep(WAIT_INTERVAL * 1000);
-      slept += WAIT_INTERVAL;
-      if (timeout > 0 && slept > timeout) {
+      slept = dev_get_millisecond_count() - now;
+      if (timeout - slept > WAIT_INTERVAL) {
+        usleep(WAIT_INTERVAL * 1000);
+      } else {
+        usleep((timeout - slept) * 1000);
         break;
       }
     }