Receiver not fully removed when BIND cancelled

radio/src/gui/480x272/model_setup.cpp

@@ -272,6 +272,7 @@ void onPXX2BindMenu(const char * result)
     uint8_t receiverIdx = CURRENT_RECEIVER_EDITED(menuVerticalPosition - HEADER_LINE);
     moduleState[moduleIdx].mode = MODULE_MODE_NORMAL;
     removePXX2ReceiverIfEmpty(moduleIdx, receiverIdx);
+    s_editMode = 0;
   }
 }
 

radio/src/gui/common/stdlcd/model_setup_pxx2.cpp

@@ -111,6 +111,7 @@ void onPXX2BindMenu(const char * result)
     uint8_t receiverIdx = CURRENT_RECEIVER_EDITED(menuVerticalPosition - HEADER_LINE);
     moduleState[moduleIdx].mode = MODULE_MODE_NORMAL;
     removePXX2ReceiverIfEmpty(moduleIdx, receiverIdx);
+    s_editMode = 0;
   }
 }
 

radio/src/opentx.h

@@ -260,7 +260,7 @@ inline void memclear(void * p, size_t size)
 inline bool is_memclear(void * p, size_t size)
 {
   uint8_t * buf = (uint8_t *)p;
-  return buf[0] == 0 && !memcmp(buf, buf + 1, size - 1);
+  return buf[0] == 0 && memcmp(buf, buf + 1, size - 1) == 0;
 }
 
 void memswap(void * a, void * b, uint8_t size);