diff --git a/ArduCopter/RC_Channel.cpp b/ArduCopter/RC_Channel.cpp
index f25406e083..559f9bf38f 100644
--- a/ArduCopter/RC_Channel.cpp
+++ b/ArduCopter/RC_Channel.cpp
@@ -162,7 +162,7 @@ void RC_Channel_Copter::do_aux_function_armdisarm(const AuxSwitchPos ch_flag)
 }
 
 // do_aux_function - implement the function invoked by auxiliary switches
-void RC_Channel_Copter::do_aux_function(const aux_func_t ch_option, const AuxSwitchPos ch_flag)
+bool RC_Channel_Copter::do_aux_function(const aux_func_t ch_option, const AuxSwitchPos ch_flag)
 {
     switch(ch_option) {
         case AUX_FUNC::FLIP:
@@ -214,12 +214,12 @@ void RC_Channel_Copter::do_aux_function(const aux_func_t ch_option, const AuxSwi
 
                 // do not allow saving new waypoints while we're in auto or disarmed
                 if (copter.flightmode->mode_number() == Mode::Number::AUTO || !copter.motors->armed()) {
-                    return;
+                    break;
                 }
 
                 // do not allow saving the first waypoint with zero throttle
                 if ((copter.mode_auto.mission.num_commands() == 0) && (copter.channel_throttle->get_control_in() == 0)) {
-                    return;
+                    break;
                 }
 
                 // create new mission command
@@ -579,11 +579,11 @@ void RC_Channel_Copter::do_aux_function(const aux_func_t ch_option, const AuxSwi
             copter.mode_acro.air_mode_aux_changed();
 #endif
             break;
-            
+
     default:
-        RC_Channel::do_aux_function(ch_option, ch_flag);
-        break;
+        return RC_Channel::do_aux_function(ch_option, ch_flag);
     }
+    return true;
 }
 
 // change air-mode status
diff --git a/ArduCopter/RC_Channel.h b/ArduCopter/RC_Channel.h
index e55c64c081..9e9eb360c8 100644
--- a/ArduCopter/RC_Channel.h
+++ b/ArduCopter/RC_Channel.h
@@ -12,7 +12,7 @@ public:
 protected:
 
     void init_aux_function(aux_func_t ch_option, AuxSwitchPos) override;
-    void do_aux_function(aux_func_t ch_option, AuxSwitchPos) override;
+    bool do_aux_function(aux_func_t ch_option, AuxSwitchPos) override;
 
 private: