Stop/clear all animations on closing a map

Should hopefully fix #1711, though I couldn't reproduce it myself
sirjuddington · Dec 23, 2024 · 1828a4a · 1828a4a
1 parent e689720
commit 1828a4a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/src/MapEditor/MapEditContext.cpp b/src/MapEditor/MapEditContext.cpp
@@ -438,6 +438,7 @@ void MapEditContext::clearMap()
 	// Clear other data
 	updateTagged();
 	info_3d_.reset();
+	renderer_.clearAnimations();
 
 	// Clear map
 	map_.clearMap();

diff --git a/src/MapEditor/Renderer/Renderer.cpp b/src/MapEditor/Renderer/Renderer.cpp
@@ -1753,3 +1753,11 @@ void Renderer::addAnimation(unique_ptr<MCAnimation> animation)
 {
 	animations_.push_back(std::move(animation));
 }
+
+// -----------------------------------------------------------------------------
+// Clears all active animations
+// -----------------------------------------------------------------------------
+void Renderer::clearAnimations()
+{
+	animations_.clear();
+}
diff --git a/src/MapEditor/Renderer/Renderer.h b/src/MapEditor/Renderer/Renderer.h
@@ -49,6 +49,7 @@ namespace mapeditor
 		void animateSelectionChange(const ItemSelection& selection);
 		void animateHilightChange(const mapeditor::Item& old_item, MapObject* old_object = nullptr);
 		void addAnimation(unique_ptr<MCAnimation> animation);
+		void clearAnimations();
 
 	private:
 		MapEditContext& context_;