improved error handling when uploading tapes to server

[rocksndiamonds.git] / src / tape.c

diff --git a/src/tape.c b/src/tape.c
index 68eeaccf0cd1267159d239005ce76870d7b1e6a6..38bc0166394f487ef64a31a979ad25e4e89b316c 100644 (file)
--- a/src/tape.c
+++ b/src/tape.c
@@ -1400,7 +1400,7 @@ static void AutoPlayTapes_SetScoreEntry(int score, int time)
   server_scores.uploaded = FALSE;
 }
 
-static void AutoPlayTapes_WaitForUpload(void)
+static boolean AutoPlayTapes_WaitForUpload(void)
 {
   unsigned int upload_delay = 0;
   unsigned int upload_delay_value = 10000;
@@ -1415,7 +1415,10 @@ static void AutoPlayTapes_WaitForUpload(void)
       PrintNoLog("\r");
       Print("- uploading score tape to score server - TIMEOUT.\n");
 
-      Fail("cannot upload score tape to score server");
+      if (program.headless)
+       Fail("cannot upload score tape to score server");
+
+      return FALSE;
     }
 
     UPDATE_BUSY_STATE();
@@ -1425,6 +1428,8 @@ static void AutoPlayTapes_WaitForUpload(void)
 
   PrintNoLog("\r");
   Print("- uploading score tape to score server - uploaded.\n");
+
+  return TRUE;
 }
 
 static int AutoPlayTapesExt(boolean initialize)
@@ -1829,7 +1834,7 @@ static int AutoPlayTapesExt(boolean initialize)
 
       SaveServerScoreFromFile(level_nr, autoplay.tape_filename);
 
-      AutoPlayTapes_WaitForUpload();
+      boolean success = AutoPlayTapes_WaitForUpload();
 
       if (use_temporary_tape_file)
         unlink(autoplay.tape_filename);
@@ -1837,6 +1842,13 @@ static int AutoPlayTapesExt(boolean initialize)
       // required for uploading multiple tapes
       autoplay.tape_filename = NULL;
 
+      if (!success)
+      {
+       num_tapes = -1;
+
+       break;
+      }
+
       continue;
     }
 
@@ -1857,7 +1869,12 @@ static int AutoPlayTapesExt(boolean initialize)
   {
     Print("\n");
     PrintLine("=", 79);
-    Print("SUMMARY: %d tapes uploaded.\n", num_tapes);
+
+    if (num_tapes >= 0)
+      Print("SUMMARY: %d tapes uploaded.\n", num_tapes);
+    else
+      Print("SUMMARY: Uploading tapes failed.\n");
+
     PrintLine("=", 79);
   }