Merge branch 'next' of https://github.com/opentx/opentx into bsongis/Side_back_in_expos_is_it_useful

2014-03-20 21:37:29 +01:00
parent 25a94e637d 78cf31c937
commit cd23b9bc00
93 changed files with 6181 additions and 1893 deletions
@@ -3425,6 +3425,10 @@ void evalFunctions()
              if (g_menuStack[0] == menuMainView
 #if defined(FRSKY)
                || g_menuStack[0] == menuTelemetryFrsky
+#endif
+#if defined(PCBTARANIS)
+                || g_menuStack[0] == menuMainViewChannelsMonitor
+                || g_menuStack[0] == menuChannelsView
 #endif
              )
                instantTrim();