diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2019-02-03 15:13:36 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2019-02-09 12:13:33 +0100 |
| commit | e39a753236808603bc1e3530a7d6091eeeeacd39 (patch) | |
| tree | 8c1f7963480bb29d49cf007935210d1e4f2842c9 | |
| parent | 5d554656d7f2392a0c98a4474641f997c7b47543 (diff) | |
random nonsense only
| -rw-r--r-- | gui/settings.cpp | 2 | ||||
| -rw-r--r-- | gui/settings.hpp | 2 | ||||
| -rw-r--r-- | proto-simconnect/ftnoir_protocol_sc.h | 2 | ||||
| -rw-r--r-- | variant/default/main-window.cpp | 10 |
4 files changed, 8 insertions, 8 deletions
diff --git a/gui/settings.cpp b/gui/settings.cpp index 711fb0f0..79a8dbfb 100644 --- a/gui/settings.cpp +++ b/gui/settings.cpp @@ -45,7 +45,7 @@ void options_dialog::set_disable_translation_state(bool value) }); } -options_dialog::options_dialog(std::function<void(bool)>&& pause_keybindings) : +options_dialog::options_dialog(std::function<void(bool)> pause_keybindings) : pause_keybindings(std::move(pause_keybindings)) { ui.setupUi(this); diff --git a/gui/settings.hpp b/gui/settings.hpp index 50245a59..8ef5aa2d 100644 --- a/gui/settings.hpp +++ b/gui/settings.hpp @@ -17,7 +17,7 @@ class OTR_GUI_EXPORT options_dialog : public QDialog signals: void closing(); public: - explicit options_dialog(std::function<void(bool)>&& pause_keybindings); + explicit options_dialog(std::function<void(bool)> pause_keybindings); private: main_settings main; std::function<void(bool)> pause_keybindings; diff --git a/proto-simconnect/ftnoir_protocol_sc.h b/proto-simconnect/ftnoir_protocol_sc.h index 62326203..dfe80ef7 100644 --- a/proto-simconnect/ftnoir_protocol_sc.h +++ b/proto-simconnect/ftnoir_protocol_sc.h @@ -30,7 +30,7 @@ struct settings : opts { value<int> sxs_manifest; settings() : opts("proto-simconnect"), - sxs_manifest(b, "simconnect-manifest", 2) + sxs_manifest(b, "simconnect-manifest", 0) {} }; diff --git a/variant/default/main-window.cpp b/variant/default/main-window.cpp index 53872644..84b89290 100644 --- a/variant/default/main-window.cpp +++ b/variant/default/main-window.cpp @@ -407,11 +407,6 @@ void main_window::start_tracker_() if (work) return; - { - double p[6] = {0,0,0, 0,0,0}; - show_pose_(p, p); - } - work = std::make_shared<Work>(pose, ev, ui.video_frame, current_tracker(), current_protocol(), current_filter()); if (!work->is_ok()) @@ -420,6 +415,11 @@ void main_window::start_tracker_() return; } + { + double p[6] = {0,0,0, 0,0,0}; + show_pose_(p, p); + } + if (pTrackerDialog) pTrackerDialog->register_tracker(work->libs.pTracker.get()); |