diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2017-02-23 06:06:20 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2017-02-23 08:54:32 +0100 |
| commit | 6f69cdc4305740ed9f54b296a62a8c59ff98da0c (patch) | |
| tree | a3ff480d2766c2429f8697983edd6ac8ef4f750b /logic/work.cpp | |
| parent | 21329f2428143140d7884b37c7db1f15a7953dc6 (diff) | |
logic, gui: move selected-libraries to struct work
Diffstat (limited to 'logic/work.cpp')
| -rw-r--r-- | logic/work.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/logic/work.cpp b/logic/work.cpp index ebac4c39..102b859e 100644 --- a/logic/work.cpp +++ b/logic/work.cpp @@ -60,12 +60,11 @@ std::shared_ptr<TrackLogger> Work::make_logger(main_settings &s) } -Work::Work(Mappings& m, SelectedLibraries& libs, WId handle) : - libs(libs), +Work::Work(Mappings& m, QFrame* frame, mem<dylib>& tracker_, mem<dylib>& filter_, mem<dylib>& proto_) : + libs(frame, tracker_, filter_, proto_), logger(make_logger(s)), tracker(std::make_shared<Tracker>(m, libs, *logger)), sc(std::make_shared<Shortcuts>()), - handle(handle), keys { key_tuple(s.key_center1, [&](bool) -> void { tracker->center(); }, true), key_tuple(s.key_center2, [&](bool) -> void { tracker->center(); }, true), @@ -83,6 +82,8 @@ Work::Work(Mappings& m, SelectedLibraries& libs, WId handle) : key_tuple(s.key_zero_press2, [&](bool x) -> void { tracker->set_zero(x); }, false), } { + if (!is_ok()) + return; reload_shortcuts(); tracker->start(); } @@ -92,6 +93,11 @@ void Work::reload_shortcuts() sc->reload(keys); } +bool Work::is_ok() const +{ + return libs.correct; +} + Work::~Work() { // order matters, otherwise use-after-free -sh |