Qt: Fix possible race/crash on shutdown

5 years ago · d80aaf3880
parent 8f82987341
commit d80aaf3880
1 changed files with 3 additions and 1 deletions
--- a/src/duckstation-qt/qthostinterface.cpp
+++ b/src/duckstation-qt/qthostinterface.cpp
@ -225,8 +225,10 @@ void QtHostInterface::onDisplayWindowKeyEvent(int key, bool pressed)

 void QtHostInterface::onDisplayWindowMouseMoveEvent(int x, int y)
 {
+  // display might be null here if the event happened after shutdown
  DebugAssert(isOnWorkerThread());
-  m_display->SetMousePosition(x, y);
+  if (m_display)
+    m_display->SetMousePosition(x, y);
 }

 void QtHostInterface::onDisplayWindowMouseButtonEvent(int button, bool pressed)