diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2016-09-26 13:14:16 +0200 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2016-09-26 13:30:04 +0200 |
commit | 164f8d8d473e571086583d86bb4ff9982abe54b4 (patch) | |
tree | 9a4a168ede7d89e774eced2283ef601445ad171b /options/scoped.cpp | |
parent | 90eca9f45e6f6481e59748a2ebf5ca6f51488f38 (diff) |
gui, options: prevent options reset on tracker stop
They should only be reset when closing the module dialog window.
This is a hack but otherwise we'd have to change all the
modules.
Issue: #466
Closes #466
Diffstat (limited to 'options/scoped.cpp')
-rw-r--r-- | options/scoped.cpp | 44 |
1 files changed, 43 insertions, 1 deletions
diff --git a/options/scoped.cpp b/options/scoped.cpp index e1ddbae2..b0677ad9 100644 --- a/options/scoped.cpp +++ b/options/scoped.cpp @@ -1,10 +1,52 @@ #include "scoped.hpp" +#include <QApplication> +#include <QThread> + +// for std::abort() +#include <cstdlib> + +#include <QDebug> namespace options { +std::atomic_bool opts::teardown_flag(false); + +void opts::set_teardown_flag(bool value) +{ + ensure_thread(); + + // we don't use exceptions in the whole project so no need for unwind protection + // also the calls aren't nested so no need for CAS either + teardown_flag = value; +} + +void opts::ensure_thread() +{ + // only as a bug check + + const QThread* ui_thread = qApp->thread(); + const QThread* curthread = QThread::currentThread(); + + if (ui_thread == nullptr) + abort(); + + if (ui_thread != curthread) + abort(); +} + opts::~opts() { - b->reload(); + if (!is_tracker_teardown()) + b->reload(); +#if 0 + else + qDebug() << "in teardown, not reloading" << b->name(); +#endif +} + +bool opts::is_tracker_teardown() +{ + return teardown_flag; } opts::opts(const QString &name) : b(make_bundle(name)) |