[chronojump] Fix since last commit

[Xavier de Blas <xaviblas src gnome org>]

commit d82a0c75adffba15f74348a36d4cd8618bbb01d0
Author: Xavier de Blas <xaviblas gmail com>
Date:   Thu Jun 23 04:42:02 2016 +0200

    Fix since last commit

 src/gui/chronojump.cs   |   21 ++++++++++++++-------
 src/gui/eventExecute.cs |    6 ++++--
 src/gui/jump.cs         |    2 +-
 3 files changed, 19 insertions(+), 10 deletions(-)
---
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index 9b4f1ba..2f6dcb4 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -4031,7 +4031,7 @@ public partial class ChronoJumpWindow
                if(createdStatsWin)
                        showUpdateStatsAndHideData(false);
 
-               ExecutingGraphData egd = event_execute_initializeVariables(
+               event_execute_initializeVariables(
                        ! chronopicWin.Connected,       //is simulated
                        currentPerson.UniqueID, 
                        currentPerson.Name, 
@@ -4039,6 +4039,7 @@ public partial class ChronoJumpWindow
                        Constants.JumpTable, //tableName
                        currentJumpType.Name 
                        );
+               ExecutingGraphData egd = event_execute_prepareForTest ();
 
                event_execute_ButtonCancel.Clicked += new EventHandler(on_cancel_clicked);
                event_execute_ButtonFinish.Clicked += new EventHandler(on_finish_clicked);
@@ -4203,7 +4204,7 @@ public partial class ChronoJumpWindow
                        showUpdateStatsAndHideData(false);
 
                //show the event doing window
-               ExecutingGraphData egd = event_execute_initializeVariables(
+               event_execute_initializeVariables(
                        ! chronopicWin.Connected,       //is simulated
                        currentPerson.UniqueID, 
                        currentPerson.Name, 
@@ -4211,6 +4212,7 @@ public partial class ChronoJumpWindow
                        Constants.JumpRjTable, //tableName
                        currentJumpRjType.Name
                        );
+               ExecutingGraphData egd = event_execute_prepareForTest ();
                
                event_execute_ButtonCancel.Clicked += new EventHandler(on_cancel_clicked);
                event_execute_ButtonFinish.Clicked += new EventHandler(on_finish_clicked);
@@ -4331,7 +4333,7 @@ public partial class ChronoJumpWindow
                if(createdStatsWin)
                        showUpdateStatsAndHideData(false);
 
-               ExecutingGraphData egd = event_execute_initializeVariables(
+               event_execute_initializeVariables(
                        ! chronopicWin.Connected,       //is simulated
                        currentPerson.UniqueID, 
                        currentPerson.Name, 
@@ -4339,6 +4341,7 @@ public partial class ChronoJumpWindow
                        Constants.RunTable, //tableName
                        currentRunType.Name 
                        );
+               ExecutingGraphData egd = event_execute_prepareForTest ();
                
                event_execute_ButtonCancel.Clicked += new EventHandler(on_cancel_clicked);
                event_execute_ButtonFinish.Clicked += new EventHandler(on_finish_clicked);
@@ -4456,7 +4459,7 @@ public partial class ChronoJumpWindow
                        showUpdateStatsAndHideData(false);
 
                //show the event doing window
-               ExecutingGraphData egd = event_execute_initializeVariables(
+               event_execute_initializeVariables(
                        ! chronopicWin.Connected,       //is simulated
                        currentPerson.UniqueID, 
                        currentPerson.Name, 
@@ -4464,6 +4467,7 @@ public partial class ChronoJumpWindow
                        Constants.RunIntervalTable, //tableName
                        currentRunIntervalType.Name
                        );
+               ExecutingGraphData egd = event_execute_prepareForTest ();
 
                event_execute_ButtonCancel.Clicked += new EventHandler(on_cancel_clicked);
                event_execute_ButtonFinish.Clicked += new EventHandler(on_finish_clicked);
@@ -4575,7 +4579,7 @@ public partial class ChronoJumpWindow
                if(createdStatsWin)
                        showUpdateStatsAndHideData(false);
 
-               ExecutingGraphData egd = event_execute_initializeVariables(
+               event_execute_initializeVariables(
                        ! chronopicWin.Connected,       //is simulated
                        currentPerson.UniqueID, 
                        currentPerson.Name, 
@@ -4583,6 +4587,7 @@ public partial class ChronoJumpWindow
                        Constants.ReactionTimeTable, //tableName
                        "" 
                        );
+               ExecutingGraphData egd = event_execute_prepareForTest ();
 
                event_execute_ButtonCancel.Clicked += new EventHandler(on_cancel_clicked);
                event_execute_ButtonFinish.Clicked += new EventHandler(on_finish_clicked);
@@ -4748,7 +4753,7 @@ public partial class ChronoJumpWindow
                        showUpdateStatsAndHideData(false);
 
                //show the event doing window
-               ExecutingGraphData egd = event_execute_initializeVariables(
+               event_execute_initializeVariables(
                        ! chronopicWin.Connected,       //is simulated
                        currentPerson.UniqueID, 
                        currentPerson.Name, 
@@ -4756,6 +4761,7 @@ public partial class ChronoJumpWindow
                        Constants.PulseTable, //tableName
                        currentPulseType.Name 
                        );
+               ExecutingGraphData egd = event_execute_prepareForTest ();
 
                event_execute_ButtonCancel.Clicked += new EventHandler(on_cancel_clicked);
                event_execute_ButtonFinish.Clicked += new EventHandler(on_finish_clicked);
@@ -4995,7 +5001,7 @@ public partial class ChronoJumpWindow
                        showUpdateStatsAndHideData(false);
 
                //show the event doing window
-               ExecutingGraphData egd = event_execute_initializeVariables(
+               event_execute_initializeVariables(
                        ! chronopicWin.Connected,       //is simulated
                        currentPerson.UniqueID, 
                        currentPerson.Name, 
@@ -5003,6 +5009,7 @@ public partial class ChronoJumpWindow
                        Constants.MultiChronopicTable, //tableName
                        currentMultiChronopicType.Name
                        ); 
+               ExecutingGraphData egd = event_execute_prepareForTest ();
 
                event_execute_ButtonCancel.Clicked += new EventHandler(on_cancel_multi_clicked);
                event_execute_ButtonFinish.Clicked += new EventHandler(on_finish_multi_clicked);
diff --git a/src/gui/eventExecute.cs b/src/gui/eventExecute.cs
index 63dc658..3d4d9ff 100644
--- a/src/gui/eventExecute.cs
+++ b/src/gui/eventExecute.cs
@@ -168,7 +168,7 @@ public partial class ChronoJumpWindow
        };
        
 
-       ExecutingGraphData event_execute_initializeVariables (
+       private void event_execute_initializeVariables (
                        bool simulated,
                        int personID,
                        string personName,
@@ -246,7 +246,9 @@ public partial class ChronoJumpWindow
                layoutBig = new Pango.Layout (event_execute_drawingarea.PangoContext);
                layoutBig.FontDescription = Pango.FontDescription.FromString ("Courier 14");
                //layoutBig.Alignment = Pango.Alignment.Center; //doesn't work, see GetPixelSize below
-       
+       }
+       private ExecutingGraphData event_execute_prepareForTest () 
+       {
                eventHasEnded = false;
 
                checkbutton_video.Sensitive = false;
diff --git a/src/gui/jump.cs b/src/gui/jump.cs
index afb0f8d..c3079b7 100644
--- a/src/gui/jump.cs
+++ b/src/gui/jump.cs
@@ -1187,7 +1187,7 @@ partial class ChronoJumpWindow
                        tv = 0.0;
                
                //intializeVariables if not done before
-               ExecutingGraphData egd = event_execute_initializeVariables(
+               event_execute_initializeVariables(
                        ! chronopicWin.Connected,       //is simulated
                        currentPerson.UniqueID, 
                        currentPerson.Name,