X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftape.c;h=fc8f922b578cdda8001ce4acd65507a4aeeca8d6;hb=9fcd46b92772e2b72aeaf036a6130fe35edc5f87;hp=a22fc9a54741013239ad7c63bf3a487c14237440;hpb=71f0d72b145b4d56e1282c8fa9c5030521f49d82;p=rocksndiamonds.git

diff --git a/src/tape.c b/src/tape.c
index a22fc9a5..fc8f922b 100644
--- a/src/tape.c
+++ b/src/tape.c
@@ -1579,15 +1579,16 @@ static int AutoPlayTapesExt(boolean initialize)
     {
       autoplay.tape_filename = global.autoplay_leveldir;
 
+      if (!fileExists(autoplay.tape_filename))
+	Fail("tape file '%s' does not exist", autoplay.tape_filename);
+
       LoadTapeFromFilename(autoplay.tape_filename);
 
       if (tape.no_valid_file)
-      {
-	if (!fileExists(autoplay.tape_filename))
-	  Fail("tape file '%s' does not exist", autoplay.tape_filename);
-	else
-	  Fail("cannot load tape file '%s'", autoplay.tape_filename);
-      }
+	Fail("cannot load tape file '%s'", autoplay.tape_filename);
+
+      if (tape.no_info_chunk)
+	Fail("cannot get levelset from tape file '%s'", autoplay.tape_filename);
 
       global.autoplay_leveldir = tape.level_identifier;
 
@@ -1791,7 +1792,8 @@ static int AutoPlayTapesExt(boolean initialize)
 				  getDefaultSolutionTapeFilename(level_nr));
 
 	boolean correct_info_chunk =
-	  (strEqual(leveldir_current->identifier, tape.level_identifier) &&
+	  (!tape.no_info_chunk &&
+	   strEqual(leveldir_current->identifier, tape.level_identifier) &&
 	   level_nr == tape.level_nr);
 
 	if (!correct_info_chunk)