From 62b90fde28bfdb0cd74db4219cbe7c0983d32ddd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Wed, 18 Oct 2023 23:34:41 +0000 Subject: [PATCH] mmu: remove ResetOnExit No change in memory --- Firmware/mmu2_error_converter.cpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/Firmware/mmu2_error_converter.cpp b/Firmware/mmu2_error_converter.cpp index 1c760b94b..52fa17fc5 100644 --- a/Firmware/mmu2_error_converter.cpp +++ b/Firmware/mmu2_error_converter.cpp @@ -186,20 +186,15 @@ const char * PrusaErrorButtonMore(){ return MSG_BTN_MORE; } -struct ResetOnExit { - ResetOnExit() = default; - ~ResetOnExit(){ - buttonSelectedOperation = ButtonOperations::NoOperation; - } -}; - Buttons ButtonPressed(ErrorCode ec) { if (buttonSelectedOperation == ButtonOperations::NoOperation) { return Buttons::NoButton; // no button } - - ResetOnExit ros; // clear buttonSelectedOperation on exit from this call - return ButtonAvailable(ec); + + const auto result = ButtonAvailable(ec); + buttonSelectedOperation = ButtonOperations::NoOperation; // Reset operation + + return result; } Buttons ButtonAvailable(ErrorCode ec) {