ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8944 from JosJuice/qtbug-10561-workaround 

DolphinQt: Replace QTBUG-10561 workaround with better workaround
This commit is contained in:
LC 2020-07-09 07:15:22 -04:00 committed by GitHub
parent 87287181dd aeeb85aa3a
commit 5281efe268
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Source/Core/DolphinQt/QtUtils/ParallelProgressDialog.h
View File

@ -1,6 +1,5 @@
#pragma once #pragma once
#include <chrono>
#include <utility> #include <utility>
#include <QObject> #include <QObject>
@ -35,19 +34,7 @@ public:
void SetMinimum(int minimum) { emit SetMinimumSignal(minimum); } void SetMinimum(int minimum) { emit SetMinimumSignal(minimum); }
void SetMinimumDuration(int ms) { emit SetMinimumDurationSignal(ms); } void SetMinimumDuration(int ms) { emit SetMinimumDurationSignal(ms); }
void SetRange(int minimum, int maximum) { emit SetRangeSignal(minimum, maximum); } void SetRange(int minimum, int maximum) { emit SetRangeSignal(minimum, maximum); }
void SetValue(int progress) { emit SetValueSignal(progress); }
// Can be called from any thread, but only from one thread at a time
void SetValue(int progress)
{
// HACK: To avoid the https://bugreports.qt.io/browse/QTBUG-10561 stack overflow,
// limit how often QProgressDialog::setValue can run
const auto current_time = std::chrono::steady_clock::now();
if (current_time - m_last_setvalue_time >= std::chrono::milliseconds(50))
{
m_last_setvalue_time = current_time;
emit SetValueSignal(progress);
}
}
// Can be called from any thread // Can be called from any thread
bool WasCanceled() { return m_was_cancelled.IsSet(); } bool WasCanceled() { return m_was_cancelled.IsSet(); }
@ -69,6 +56,27 @@ signals:
private slots: private slots:
void OnCancelled() { m_was_cancelled.Set(); } void OnCancelled() { m_was_cancelled.Set(); }
void SetValueSlot(int progress)
{
// Normally we would've been able to just call setValue instead of having this wrapper
// around it, but due to the https://bugreports.qt.io/browse/QTBUG-10561 stack overflow,
// we can't. Short summary of the stack overflow: setValue calls processEvents,
// which calls SetValueSlot if there is another SetValueSlot event in the queue,
// which would call setValue if it wasn't for the check below, and so on.
m_last_received_progress = progress;
if (m_is_setting_value)
return;
m_is_setting_value = true;
while (m_last_received_progress != m_dialog.value())
m_dialog.setValue(m_last_received_progress);
m_is_setting_value = false;
}
private: private:
template <typename Func1, typename Func2> template <typename Func1, typename Func2>
void ConnectSignal(Func1 signal, Func2 slot) void ConnectSignal(Func1 signal, Func2 slot)
@ -94,7 +102,9 @@ private:
ConnectSignal(&ParallelProgressDialog::SetMinimumDurationSignal, ConnectSignal(&ParallelProgressDialog::SetMinimumDurationSignal,
&QProgressDialog::setMinimumDuration); &QProgressDialog::setMinimumDuration);
ConnectSignal(&ParallelProgressDialog::SetRangeSignal, &QProgressDialog::setRange); ConnectSignal(&ParallelProgressDialog::SetRangeSignal, &QProgressDialog::setRange);
ConnectSignal(&ParallelProgressDialog::SetValueSignal, &QProgressDialog::setValue);
QObject::connect(this, &ParallelProgressDialog::SetValueSignal, this,
&ParallelProgressDialog::SetValueSlot);
ConnectSlot(&QProgressDialog::canceled, &ParallelProgressDialog::OnCancelled); ConnectSlot(&QProgressDialog::canceled, &ParallelProgressDialog::OnCancelled);
@ -104,5 +114,6 @@ private:
QProgressDialog m_dialog; QProgressDialog m_dialog;
Common::Flag m_was_cancelled; Common::Flag m_was_cancelled;
std::chrono::time_point<std::chrono::steady_clock> m_last_setvalue_time; int m_last_received_progress;
bool m_is_setting_value = false;
}; };