Merge branch 'bsongis/Issue592_sticky_switches' of

https://github.com/opentx/opentx into bsongis/Issue592_sticky_switches Conflicts: radio/src/opentx.cpp
2014-02-03 15:05:10 +01:00
parent e48c27d30a b404673f58
commit c8ae023a15
1 changed files with 4 additions and 0 deletions
@@ -3089,7 +3089,11 @@ void evalFunctions()
      bool active = getSwitch(swtch);
      if (active) newActiveSwitches |= switch_mask;

+<<<<<<< HEAD
      if (active || IS_PLAY_BOTH_FUNC(sd)) {
+=======
+      if (active || CFN_FUNC(sd) == FUNC_PLAY_BOTH) {
+>>>>>>> b404673f5830bb3c51182e402890bb804d3f23c2

        if (CFN_ACTIVE(sd)) {
          if (CFN_FUNC(sd) < FUNC_TRAINER) {