history-museum/winamp
1
0
Fork 0
mirror of https://github.com/WinampDesktop/winamp.git synced 2025-05-03 07:25:43 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Qt: Fix resume without any state wedging emu

Browse Source
This commit is contained in:
Connor McLaughlin 2020-10-03 00:28:57 +10:00
parent 10d9b17b4f
commit 7cf8f60464
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -361,23 +361,24 @@ void QtHostInterface::resumeSystemFromState(const QString& filename, bool boot_o
return; return;
} }
std::string state_filename = filename.toStdString();
if (state_filename.empty())
{
state_filename = GetMostRecentResumeSaveStatePath();
if (state_filename.empty())
{
emit errorReported(tr("No resume save state found."));
return;
}
}
emit emulationStarting(); emit emulationStarting();
if (filename.isEmpty()) ResumeSystemFromState(state_filename.c_str(), boot_on_failure);
ResumeSystemFromMostRecentState();
else
ResumeSystemFromState(filename.toStdString().c_str(), boot_on_failure);
} }
void QtHostInterface::resumeSystemFromMostRecentState() void QtHostInterface::resumeSystemFromMostRecentState()
{ {
if (!isOnWorkerThread()) resumeSystemFromState(QString(), false);
{
QMetaObject::invokeMethod(this, "resumeSystemFromMostRecentState");
return;
}
emit emulationStarting();
ResumeSystemFromMostRecentState();
} }
void QtHostInterface::onDisplayWindowKeyEvent(int key, bool pressed) void QtHostInterface::onDisplayWindowKeyEvent(int key, bool pressed)