fix(zq): Crash on changing map count

ZQuestClassic · Dec 2, 2023 · 92c1902 · 92c1902
1 parent 6d78a15
commit 92c1902
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/zq/zq_class.cpp b/src/zq/zq_class.cpp
@@ -162,7 +162,12 @@ void zmap::clear()
 {
 	*this = zmap();
 }
-
+void zmap::force_refr_pointer()
+{
+	if(unsigned(currmap) > map_count || (currmap*MAPSCRS > TheMaps.size()))
+		screens = &TheMaps[currmap*MAPSCRS];
+	else screens = nullptr;
+}
 bool zmap::CanUndo()
 {
     return undo_stack.size() > 0;
@@ -6368,6 +6373,7 @@ bool setMapCount2(int32_t c)
     try
     {
         TheMaps.resize(c*MAPSCRS);
+		Map.force_refr_pointer();
 		map_autolayers.resize(c*6);
     }
     catch(...)

diff --git a/src/zq/zq_class.h b/src/zq/zq_class.h
@@ -195,6 +195,7 @@ class zmap
     zmap();
     ~zmap();
 	void clear();
+	void force_refr_pointer();
     bool CanUndo();
     bool CanRedo();
     bool CanPaste();