Libwalletqt: integrate changes from upstream

Co-authored-by: xiphon <xiphon@protonmail.com>
This commit is contained in:
tobtoht
2020-10-14 16:50:38 +02:00
co-authored by xiphon
parent ffa8c3e5bf
commit 1ff8a2aaf4
4 changed files with 226 additions and 114 deletions
+5
View File
@@ -68,6 +68,11 @@ QPair<bool, QFuture<void>> FutureScheduler::run(std::function<void()> function)
// });
//}
bool FutureScheduler::stopping() const noexcept
{
return Stopping;
}
bool FutureScheduler::add() noexcept
{
QMutexLocker locker(&Mutex);
+2 -1
View File
@@ -26,6 +26,7 @@ public:
QPair<bool, QFuture<void>> run(std::function<void()> function) noexcept;
// QPair<bool, QFuture<QJSValueList>> run(std::function<QJSValueList()> function, const QJSValue &callback);
bool stopping() const noexcept;
private:
bool add() noexcept;
@@ -62,7 +63,7 @@ private:
size_t Alive;
QWaitCondition Condition;
QMutex Mutex;
bool Stopping;
std::atomic<bool> Stopping;
};
#endif // FUTURE_SCHEDULER_H