From 8a7dc4d009ba1c6a69549e752fc29ebd1a461085 Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Thu, 10 May 2012 21:16:44 +0000
Subject: [PATCH] Issue 25 solved

---
 src/general_menus.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/general_menus.cpp b/src/general_menus.cpp
index 6f4c971be..30cdfae5a 100644
--- a/src/general_menus.cpp
+++ b/src/general_menus.cpp
@@ -519,17 +519,17 @@ void menuProcTrainer(uint8_t event)
         switch(j) {
           case 0:
             lcd_putsiAtt(4*FW, y, STR_TRNMODE, td->mode, attr);
-            if (attr) CHECK_INCDEC_GENVAR(event, td->mode, 0, 2);
+            if (attr&BLINK) CHECK_INCDEC_GENVAR(event, td->mode, 0, 2);
             break;
 
           case 1:
             lcd_outdezAtt(11*FW, y, td->studWeight, attr);
-            if (attr) CHECK_INCDEC_GENVAR(event, td->studWeight, -100, 100);
+            if (attr&BLINK) CHECK_INCDEC_GENVAR(event, td->studWeight, -100, 100);
             break;
 
           case 2:
             lcd_putsiAtt(12*FW, y, STR_TRNCHN, td->srcChn, attr);
-            if (attr) CHECK_INCDEC_GENVAR(event, td->srcChn, 0, 3);
+            if (attr&BLINK) CHECK_INCDEC_GENVAR(event, td->srcChn, 0, 3);
             break;
         }
       }
@@ -554,6 +554,7 @@ void menuProcTrainer(uint8_t event)
 
     if (attr) {
       if (event==EVT_KEY_FIRST(KEY_MENU)){
+        s_editMode = -1;
         memcpy(g_eeGeneral.trainer.calib, g_ppmIns, sizeof(g_eeGeneral.trainer.calib));
         eeDirty(EE_GENERAL);
         AUDIO_KEYPAD_UP();