piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-21 05:09:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix freeze when starting new emu instance while using OpenGL

Browse Source
This commit is contained in:
Arisotura
2024-10-27 10:17:59 +01:00
parent 24ca1a5fdb
commit e6f0d77aa0
4 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/frontend/qt_sdl/Window.cpp
View File

@ -2147,9 +2147,14 @@ void MainWindow::onEmuReset()
void MainWindow::onUpdateVideoSettings(bool glchange)
{
MainWindow* parentwin = (MainWindow*)parentWidget();
if (parentwin)
return parentwin->onUpdateVideoSettings(glchange);
if (windowID != 0)
{
MainWindow* parentwin = (MainWindow*)parentWidget();
if (parentwin)
parentwin->onUpdateVideoSettings(glchange);
return;
}
bool hadOGL = hasOGL;
if (glchange)
@ -2166,12 +2171,15 @@ void MainWindow::onUpdateVideoSettings(bool glchange)
{
if (hasOGL) emuThread->initContext(windowID);
auto childwins = findChildren<MainWindow*>(nullptr, Qt::FindDirectChildrenOnly);
for (auto child : childwins)
if (windowID == 0)
{
if (hadOGL) emuThread->deinitContext(child->windowID);
child->createScreenPanel();
if (hasOGL) emuThread->initContext(child->windowID);
auto childwins = findChildren<MainWindow *>(nullptr, Qt::FindDirectChildrenOnly);
for (auto child: childwins)
{
if (hadOGL) emuThread->deinitContext(child->windowID);
child->createScreenPanel();
if (hasOGL) emuThread->initContext(child->windowID);
}
}
emuThread->emuUnpause();