[chronojump] Encoder Fixed graphical bug on creating exercise type



commit 0dd314d0d2b761a38522c76482d9500e2a969990
Author: Xavier de Blas <xaviblas gmail com>
Date:   Mon Dec 3 16:31:34 2018 +0100

    Encoder Fixed graphical bug on creating exercise type
    
    Happened after clicking accept without an exercise name or a name that
    already exists, then accept does nothing.
    Now works as expected.

 src/gui/encoder.cs | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)
---
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index 441f5bc0..40c91c78 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -4556,16 +4556,24 @@ public partial class ChronoJumpWindow
                genericWin.ShowNow();
        }
        
-       void on_button_encoder_exercise_edit_accepted (object o, EventArgs args) {
-               encoder_exercise_edit(false);
-               genericWin.Button_accept.Clicked -= new 
EventHandler(on_button_encoder_exercise_edit_accepted);
+       void on_button_encoder_exercise_edit_accepted (object o, EventArgs args)
+       {
+               if(encoder_exercise_edit(false))
+               {
+                       genericWin.Button_accept.Clicked -= new 
EventHandler(on_button_encoder_exercise_edit_accepted);
+                       genericWin.HideAndNull();
+               }
        }
-       void on_button_encoder_exercise_add_accepted (object o, EventArgs args) {
-               encoder_exercise_edit(true);
-               genericWin.Button_accept.Clicked -= new EventHandler(on_button_encoder_exercise_add_accepted);
+       void on_button_encoder_exercise_add_accepted (object o, EventArgs args)
+       {
+               if(encoder_exercise_edit(true))
+               {
+                       genericWin.Button_accept.Clicked -= new 
EventHandler(on_button_encoder_exercise_add_accepted);
+                       genericWin.HideAndNull();
+               }
        }
                        
-       void encoder_exercise_edit (bool adding) 
+       bool encoder_exercise_edit (bool adding)
        {
                string name = Util.RemoveTildeAndColonAndDot(genericWin.EntrySelected);
                name = Util.RemoveChar(name, '"');
@@ -4593,10 +4601,11 @@ public partial class ChronoJumpWindow
                                                );
 
                        updateEncoderExercisesGui(name);
-
-                       genericWin.HideAndNull();
                        LogB.Information("done");
+                       return true;
                }
+
+               return false;
        }
 
        private void updateEncoderExercisesGui(string name)


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