changed fallback to default level set on errors only when run interactively

[rocksndiamonds.git] / src / init.c

diff --git a/src/init.c b/src/init.c
index 2a5807a4867de736dceaf9aece45f64b0be15eca..54f4277d736fc9843ce9a583c9983dc10fc0782e 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -97,6 +97,9 @@ void DrawInitAnim()
   int sync_frame = FrameCounter;
   int x, y;
 
+  /* prevent OS (Windows) from complaining about program not responding */
+  CheckQuitEvent();
+
   if (game_status != GAME_MODE_LOADING)
     return;
 
@@ -6112,7 +6115,7 @@ void CloseAllAndExit(int exit_value)
   CloseVideoDisplay();
   ClosePlatformDependentStuff();
 
-  if (exit_value != 0)
+  if (exit_value != 0 && !options.execute_command)
   {
     /* fall back to default level set (current set may have caused an error) */
     SaveLevelSetup_LastSeries_Deactivate();