ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Fix possible crash/race when startup fails

This commit is contained in:
Connor McLaughlin 2020-02-16 00:14:56 +09:00
parent 59cf799491
commit 6d945439eb
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/duckstation-qt/qthostinterface.cpp
View File

@ -227,7 +227,9 @@ void QtHostInterface::doHandleKeyEvent(int key, bool pressed)
void QtHostInterface::onDisplayWindowResized(int width, int height)
{
m_display_window->onWindowResized(width, height);
// this can be null if it was destroyed and the main thread is late catching up
if (m_display_window)
m_display_window->onWindowResized(width, height);
}
bool QtHostInterface::AcquireHostDisplay()
@ -258,7 +260,6 @@ void QtHostInterface::ReleaseHostDisplay()
{
DebugAssert(m_display_window && m_display == m_display_window->getHostDisplayInterface());
m_display = nullptr;
m_display_window->disconnect(this);
m_display_window->destroyDeviceContext();
m_display_window = nullptr;
emit destroyDisplayWindowRequested();