starred/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2026-02-04 05:04:33 +00:00
Code Issues 1.1k Packages Projects Releases 20 Wiki Activity

Qt: Remove unused block_until_done parameter

Browse Source 
Recipe for deadlocks.
This commit is contained in:
Stenzek
2025-12-02 20:06:54 +10:00
parent 84aa425620
commit 60dbc5ad3d
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/duckstation-qt/qthost.cpp
View File

@@ -1513,13 +1513,12 @@ void EmuThread::loadState(bool global, qint32 slot)
System::GetGameSaveStatePath(System::GetGameSerial(), slot));
}
void EmuThread::saveState(const QString& path, bool block_until_done /* = false */)
void EmuThread::saveState(const QString& path)
{
if (!isCurrentThread())
{
QMetaObject::invokeMethod(this, static_cast<void (EmuThread::*)(const QString&, bool)>(&EmuThread::saveState),
block_until_done ? Qt::BlockingQueuedConnection : Qt::QueuedConnection, path,
block_until_done);
QMetaObject::invokeMethod(this, static_cast<void (EmuThread::*)(const QString&)>(&EmuThread::saveState),
Qt::QueuedConnection, path);
return;
}
@@ -1533,13 +1532,12 @@ void EmuThread::saveState(const QString& path, bool block_until_done /* = false
emit errorReported(tr("Error"), tr("Failed to save state: %1").arg(QString::fromStdString(error.GetDescription())));
}
void EmuThread::saveState(bool global, qint32 slot, bool block_until_done /* = false */)
void EmuThread::saveState(bool global, qint32 slot)
{
if (!isCurrentThread())
{
QMetaObject::invokeMethod(this, static_cast<void (EmuThread::*)(bool, qint32, bool)>(&EmuThread::saveState),
block_until_done ? Qt::BlockingQueuedConnection : Qt::QueuedConnection, global, slot,
block_until_done);
QMetaObject::invokeMethod(this, static_cast<void (EmuThread::*)(bool, qint32)>(&EmuThread::saveState),
Qt::QueuedConnection, global, slot);
return;
}

4
src/duckstation-qt/qthost.h
View File

@@ -158,8 +158,8 @@ public:
void changeDiscFromPlaylist(quint32 index);
void loadState(const QString& path);
void loadState(bool global, qint32 slot);
void saveState(const QString& path, bool block_until_done = false);
void saveState(bool global, qint32 slot, bool block_until_done = false);
void saveState(const QString& path);
void saveState(bool global, qint32 slot);
void undoLoadState();
void setAudioOutputVolume(int volume, int fast_forward_volume);
void setAudioOutputMuted(bool muted);