From 23da1e5b1a384de735605da4c7f47f5cf9150e7e Mon Sep 17 00:00:00 2001 From: Maschell Date: Sun, 5 Jan 2025 15:20:47 +0100 Subject: [PATCH] WUPSConfigItemButtonCombo: Fix abortng button combo detection (hopefully for real) --- libraries/libwups/WUPSConfigItemButtonCombo.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libraries/libwups/WUPSConfigItemButtonCombo.cpp b/libraries/libwups/WUPSConfigItemButtonCombo.cpp index a1befe3..ae5336a 100644 --- a/libraries/libwups/WUPSConfigItemButtonCombo.cpp +++ b/libraries/libwups/WUPSConfigItemButtonCombo.cpp @@ -114,6 +114,8 @@ namespace { if (const auto res = WUPSButtonComboAPI_DetectButtonCombo_Blocking(&options, &buttonCombo); res != WUPS_BUTTON_COMBO_ERROR_SUCCESS && res != WUPS_BUTTON_COMBO_ERROR_ABORTED) { OSReport("WUPSButtonComboAPI_DetectButtonCombo_Blocking returned %s\n", WUPSButtonComboAPI_GetStatusStr(res)); return res; + } else if (res == WUPS_BUTTON_COMBO_ERROR_ABORTED) { + return res; } WUPSButtonCombo_ComboStatus status = WUPS_BUTTON_COMBO_COMBO_STATUS_INVALID_STATUS;