diff options
-rw-r--r-- | tracker-joystick/ftnoir_tracker_joystick_dialog.cpp | 7 | ||||
-rw-r--r-- | tracker-pt/ftnoir_tracker_pt_dialog.cpp | 9 | ||||
-rw-r--r-- | tracker-rift-025/ftnoir_tracker_rift_dialog_025.cpp | 1 | ||||
-rw-r--r-- | tracker-rift-042/ftnoir_tracker_rift_dialog_042.cpp | 1 | ||||
-rw-r--r-- | tracker-rift-080/ftnoir_tracker_rift_dialog_080.cpp | 1 | ||||
-rw-r--r-- | tracker-udp/ftnoir_tracker_udp_dialog.cpp | 1 |
6 files changed, 7 insertions, 13 deletions
diff --git a/tracker-joystick/ftnoir_tracker_joystick_dialog.cpp b/tracker-joystick/ftnoir_tracker_joystick_dialog.cpp index 3bacc877..035beef6 100644 --- a/tracker-joystick/ftnoir_tracker_joystick_dialog.cpp +++ b/tracker-joystick/ftnoir_tracker_joystick_dialog.cpp @@ -11,13 +11,13 @@ TrackerControls::TrackerControls() : tracker(nullptr) { win32_joy_ctx joy_ctx; - + _joys = QList<joys>(); - + for (auto j : joy_ctx.get_joy_info()) _joys.push_back(joys { j.name, j.guid }); } - + { const QString guid = s.guid; int idx = 0; @@ -49,6 +49,5 @@ void TrackerControls::doOK() { } void TrackerControls::doCancel() { - s.b->reload(); close(); } diff --git a/tracker-pt/ftnoir_tracker_pt_dialog.cpp b/tracker-pt/ftnoir_tracker_pt_dialog.cpp index a6f8d8d0..8c3ec27f 100644 --- a/tracker-pt/ftnoir_tracker_pt_dialog.cpp +++ b/tracker-pt/ftnoir_tracker_pt_dialog.cpp @@ -55,13 +55,13 @@ TrackerDialog_PT::TrackerDialog_PT() tie_setting(s.t_MH_x, ui.tx_spin); tie_setting(s.t_MH_y, ui.ty_spin); tie_setting(s.t_MH_z, ui.tz_spin); - + tie_setting(s.fov, ui.fov); - + tie_setting(s.active_model_panel, ui.model_tabs); - + tie_setting(s.dynamic_pose, ui.dynamic_pose); - tie_setting(s.init_phase_timeout, ui.init_phase_timeout); + tie_setting(s.init_phase_timeout, ui.init_phase_timeout); tie_setting(s.auto_threshold, ui.auto_threshold); @@ -160,7 +160,6 @@ void TrackerDialog_PT::doOK() void TrackerDialog_PT::doCancel() { - s.b->reload(); close(); } diff --git a/tracker-rift-025/ftnoir_tracker_rift_dialog_025.cpp b/tracker-rift-025/ftnoir_tracker_rift_dialog_025.cpp index 3d7173fa..f13883e0 100644 --- a/tracker-rift-025/ftnoir_tracker_rift_dialog_025.cpp +++ b/tracker-rift-025/ftnoir_tracker_rift_dialog_025.cpp @@ -20,7 +20,6 @@ void TrackerControls::doOK() { } void TrackerControls::doCancel() { - s.b->reload(); close(); } diff --git a/tracker-rift-042/ftnoir_tracker_rift_dialog_042.cpp b/tracker-rift-042/ftnoir_tracker_rift_dialog_042.cpp index e5401aa1..3fcf632c 100644 --- a/tracker-rift-042/ftnoir_tracker_rift_dialog_042.cpp +++ b/tracker-rift-042/ftnoir_tracker_rift_dialog_042.cpp @@ -20,7 +20,6 @@ void TrackerControls::doOK() { } void TrackerControls::doCancel() { - s.b->reload(); close(); } diff --git a/tracker-rift-080/ftnoir_tracker_rift_dialog_080.cpp b/tracker-rift-080/ftnoir_tracker_rift_dialog_080.cpp index a91adeaf..fd28475d 100644 --- a/tracker-rift-080/ftnoir_tracker_rift_dialog_080.cpp +++ b/tracker-rift-080/ftnoir_tracker_rift_dialog_080.cpp @@ -20,7 +20,6 @@ void TrackerControls::doOK() { } void TrackerControls::doCancel() { - s.b->reload(); close(); } diff --git a/tracker-udp/ftnoir_tracker_udp_dialog.cpp b/tracker-udp/ftnoir_tracker_udp_dialog.cpp index 2df81409..df274541 100644 --- a/tracker-udp/ftnoir_tracker_udp_dialog.cpp +++ b/tracker-udp/ftnoir_tracker_udp_dialog.cpp @@ -20,7 +20,6 @@ void TrackerControls::doOK() { } void TrackerControls::doCancel() { - s.b->reload(); close(); } |