fix #105: Ignore removed sprites in MouseEventHandler

adazem009 · adazem009 · commit 054cbdadaf87 · 2024-03-02T22:52:56.000+01:00
diff --git a/src/mouseeventhandler.cpp b/src/mouseeventhandler.cpp
@@ -113,6 +113,14 @@ void scratchcpprender::MouseEventHandler::getSprites()
         Q_ASSERT(sprite->scratchTarget());
         m_sprites.push_back(sprite);
     }
+
+    // Make sure the clicked and hovered item pointers are in the list
+    // If not, make them nullptr
+    if (std::find(m_sprites.begin(), m_sprites.end(), m_clickedItem) == m_sprites.end())
+        m_clickedItem = nullptr;
+
+    if (std::find(m_sprites.begin(), m_sprites.end(), m_hoveredItem) == m_sprites.end())
+        m_hoveredItem = nullptr;
 }
 
 void scratchcpprender::MouseEventHandler::addClone(SpriteModel *model)

Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,14 @@ void scratchcpprender::MouseEventHandler::getSprites()`
`113`	`113`	`Q_ASSERT(sprite->scratchTarget());`
`114`	`114`	`m_sprites.push_back(sprite);`
`115`	`115`	`}`
	`116`	`+`
	`117`	`+ // Make sure the clicked and hovered item pointers are in the list`
	`118`	`+ // If not, make them nullptr`
	`119`	`+ if (std::find(m_sprites.begin(), m_sprites.end(), m_clickedItem) == m_sprites.end())`
	`120`	`+ m_clickedItem = nullptr;`
	`121`	`+`
	`122`	`+ if (std::find(m_sprites.begin(), m_sprites.end(), m_hoveredItem) == m_sprites.end())`
	`123`	`+ m_hoveredItem = nullptr;`
`116`	`124`	`}`
`117`	`125`
`118`	`126`	`void scratchcpprender::MouseEventHandler::addClone(SpriteModel *model)`