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

window: move cleanup code to destructor (closeEvent() isn't called for children)

Browse Source
This commit is contained in:
Arisotura
2025-06-28 03:48:42 +02:00
parent ec2f7ee838
commit baad893bc0
2 changed files with 12 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -809,6 +809,18 @@ MainWindow::MainWindow(int id, EmuInstance* inst, QWidget* parent) :
MainWindow::~MainWindow() MainWindow::~MainWindow()
{ {
if (windowID == 0)
emuInstance->saveEnabledWindows();
else
saveEnabled(false);
QByteArray geom = saveGeometry();
QByteArray enc = geom.toBase64(QByteArray::Base64Encoding);
windowCfg.SetString("Geometry", enc.toStdString());
Config::Save();
emuInstance->deleteWindow(windowID, false);
if (hasMenu) if (hasMenu)
{ {
delete[] actScreenAspectTop; delete[] actScreenAspectTop;
@ -829,28 +841,6 @@ void MainWindow::saveEnabled(bool enabled)
enabledSaved = true; enabledSaved = true;
} }
void MainWindow::closeEvent(QCloseEvent* event)
{
if (!emuInstance) return;
if (windowID == 0)
emuInstance->saveEnabledWindows();
else
saveEnabled(false);
QByteArray geom = saveGeometry();
QByteArray enc = geom.toBase64(QByteArray::Base64Encoding);
windowCfg.SetString("Geometry", enc.toStdString());
Config::Save();
emuInstance->deleteWindow(windowID, false);
// emuInstance may be deleted
// prevent use after free from us
emuInstance = nullptr;
QMainWindow::closeEvent(event);
}
void MainWindow::createScreenPanel() void MainWindow::createScreenPanel()
{ {
if (panel) delete panel; if (panel) delete panel;

2
src/frontend/qt_sdl/Window.h
View File

@ -242,8 +242,6 @@ private slots:
void onScreenEmphasisToggled(); void onScreenEmphasisToggled();
private: private:
virtual void closeEvent(QCloseEvent* event) override;
QStringList currentROM; QStringList currentROM;
QStringList currentGBAROM; QStringList currentGBAROM;
QList<QString> recentFileList; QList<QString> recentFileList;