[chronojump] Fixed a glitch on importing files making forceSensor top combo have the exercise values of runEncode



commit c345c14faeb3b444d3424bf1e8dce2c4abd4c026
Author: Xavier de Blas <xaviblas gmail com>
Date:   Fri Feb 11 17:21:11 2022 +0100

    Fixed a glitch on importing files making forceSensor top combo have the exercise values of runEncoder (if 
forceSensor mode is active)

 src/gui/app1/forceSensor.cs | 3 ++-
 src/gui/app1/runEncoder.cs  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/src/gui/app1/forceSensor.cs b/src/gui/app1/forceSensor.cs
index 8397309ad..f1ea1f548 100644
--- a/src/gui/app1/forceSensor.cs
+++ b/src/gui/app1/forceSensor.cs
@@ -3377,7 +3377,8 @@ LogB.Information(" fs R ");
                        combo_force_sensor_exercise.Active = 
UtilGtk.ComboMakeActive(combo_force_sensor_exercise, name);
 
                //update also combo_select_contacts_top (but check do not crash on start)
-               if(combo_select_contacts_top != null)
+               //we need the 2nd check because without is, on import if we are on other mode, top combo 
could have been updated with this mode exercises
+               if(combo_select_contacts_top != null && current_mode == Constants.Modes.FORCESENSOR)
                {
                        comboSelectContactsTopNoFollow = true;
                        UtilGtk.ComboUpdate(combo_select_contacts_top,
diff --git a/src/gui/app1/runEncoder.cs b/src/gui/app1/runEncoder.cs
index 0497815dc..ae603ece3 100644
--- a/src/gui/app1/runEncoder.cs
+++ b/src/gui/app1/runEncoder.cs
@@ -1870,7 +1870,8 @@ public partial class ChronoJumpWindow
                        combo_run_encoder_exercise.Active = 
UtilGtk.ComboMakeActive(combo_run_encoder_exercise, name);
 
                //update also combo_select_contacts_top (but check do not crash on start)
-               if(combo_select_contacts_top != null)
+               //we need the 2nd check because without is, on import if we are on other mode, top combo 
could have been updated with this mode exercises
+               if(combo_select_contacts_top != null && current_mode == Constants.Modes.RUNSENCODER)
                {
                        comboSelectContactsTopNoFollow = true;
                        UtilGtk.ComboUpdate(combo_select_contacts_top,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]