fix crash on exit with mouse module

benkuper · Jun 8, 2024 · 8c782b0 · 8c782b0
1 parent 1af36cc
commit 8c782b0
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/Source/Module/modules/controller/mouse/MouseModule.cpp b/Source/Module/modules/controller/mouse/MouseModule.cpp
@@ -77,12 +77,13 @@ MouseModule::~MouseModule()
 
 void MouseModule::clearItem()
 {
-	Module::clearItem();
 #if JUCE_WINDOWS
-	MouseHooker::getInstance()->removeListener(this);
+	if(MouseHooker::getInstanceWithoutCreating() != nullptr) MouseHooker::getInstance()->removeListener(this);
 #else
-	Desktop::getInstance().removeGlobalMouseListener(this);
+	if(Desktop::getInstanceWithoutCreating() != nullptr) Desktop::getInstance().removeGlobalMouseListener(this);
 #endif
+
+	Module::clearItem();
 }
 
 void MouseModule::setCursorPosition(Point<float>& pos, bool isRelative)