From b4599e30649dccba22ebfa309701ec084b850832 Mon Sep 17 00:00:00 2001 From: RSDuck Date: Wed, 5 Oct 2022 00:08:17 +0200 Subject: [PATCH] make it atleast a little more thread safe --- src/frontend/qt_sdl/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/frontend/qt_sdl/main.cpp b/src/frontend/qt_sdl/main.cpp index d9d6a332..d2e00b9d 100644 --- a/src/frontend/qt_sdl/main.cpp +++ b/src/frontend/qt_sdl/main.cpp @@ -340,6 +340,8 @@ EmuThread::EmuThread(QObject* parent) : QThread(parent) connect(this, SIGNAL(screenLayoutChange()), mainWindow->panelWidget, SLOT(onScreenLayoutChanged())); connect(this, SIGNAL(windowFullscreenToggle()), mainWindow, SLOT(onFullscreenToggled())); connect(this, SIGNAL(swapScreensToggle()), mainWindow->actScreenSwap, SLOT(trigger())); + + static_cast(mainWindow->panel)->transferLayout(this); } void EmuThread::updateScreenSettings(bool filter, const WindowInfo& windowInfo, int numScreens, int* screenKind, float* screenMatrix) @@ -423,8 +425,6 @@ void EmuThread::initOpenGL() memset(zeroData, 0, sizeof(zeroData)); glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 192, 256, 2, GL_RGBA, GL_UNSIGNED_BYTE, zeroData); - static_cast(mainWindow->panel)->transferLayout(this); - OSD::Init(true); oglContext->SetSwapInterval(Config::ScreenVSync ? Config::ScreenVSyncInterval : 0);