Fixed possible crash after a scripted tool disappears while active

For example, when switching away from a project while having a scripted tool selected, the roaming MapEditor::mSelectedTool pointer could end up being referenced in MapEditor::setCurrentDocument, causing a crash.
mapeditor · Jan 12, 2024 · e11d4ee · e11d4ee
1 parent d1c1fb8
commit e11d4ee
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/NEWS.md b/NEWS.md
@@ -5,6 +5,7 @@
 * tmxviewer: Added support for viewing JSON maps (#3866)
 * Windows: Fixed the support for WebP images (updated to Qt 6.5.3)
 * Fixed mouse handling issue when zooming while painting (#3863)
+* Fixed possible crash after a scripted tool disappears while active
 
 ### Tiled 1.10.2 (4 August 2023)
 

diff --git a/src/tiled/toolmanager.cpp b/src/tiled/toolmanager.cpp
@@ -148,7 +148,7 @@ void ToolManager::unregisterTool(AbstractTool *tool)
             it.remove();
 
     if (mSelectedTool == tool)
-        mSelectedTool = nullptr;
+        setSelectedTool(nullptr);
 
     autoSwitchTool();
 }