Encoder shortcut resets button presses

src/uibuttons.cpp

@@ -364,3 +364,11 @@ void CUIButtons::Update (void)
 	}
 }
 
+void CUIButtons::ResetButton (unsigned pinNumber)
+{
+	for (unsigned i=0; i<MAX_BUTTONS; i++) {
+		if (m_buttons[i].getPinNumber() == pinNumber) {
+			m_buttons[i].reset();
+		}
+	}
+}

src/uibuttons.h

@@ -113,6 +113,8 @@ public:
 	void RegisterEventHandler (BtnEventHandler *handler, void *param = 0);
 	
 	void Update (void);
+
+	void ResetButton (unsigned pinNumber);
 	
 private:
 	// Up to 5 buttons can be defined

src/userinterface.cpp

@@ -224,13 +224,26 @@ void CUserInterface::EncoderEventHandler (CKY040::TEvent Event)
 		break;
 
 	case CKY040::EventClockwise:
-		m_Menu.EventHandler (m_bSwitchPressed ? CUIMenu::MenuEventPressAndStepUp
-						      : CUIMenu::MenuEventStepUp);
+		if (m_bSwitchPressed) {
+			// We must reset the encoder switch button to prevent events from being
+			// triggered after the encoder is rotated
+			m_pUIButtons->ResetButton(m_pConfig->GetEncoderPinSwitch());
+			m_Menu.EventHandler(CUIMenu::MenuEventPressAndStepUp);
+
+		}
+		else {
+			m_Menu.EventHandler(CUIMenu::MenuEventStepUp);
+		}
 		break;
 
 	case CKY040::EventCounterclockwise:
-		m_Menu.EventHandler (m_bSwitchPressed ? CUIMenu::MenuEventPressAndStepDown
-						      : CUIMenu::MenuEventStepDown);
+		if (m_bSwitchPressed) {
+			m_pUIButtons->ResetButton(m_pConfig->GetEncoderPinSwitch());
+			m_Menu.EventHandler(CUIMenu::MenuEventPressAndStepDown);
+		}
+		else {
+			m_Menu.EventHandler(CUIMenu::MenuEventStepDown);
+		}
 		break;
 
 	case CKY040::EventSwitchHold: