From 49c8b5bca1713b1c5f0a69eb064695470f1149b6 Mon Sep 17 00:00:00 2001 From: Hayodea Hakol Date: Wed, 30 Jul 2025 10:33:50 -0400 Subject: [PATCH] SenseApiMgr: Print dev info when detaching, use early return pattern --- senseApis/xcbWindow/xcbWindow.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/senseApis/xcbWindow/xcbWindow.cpp b/senseApis/xcbWindow/xcbWindow.cpp index be975e3..70521c2 100644 --- a/senseApis/xcbWindow/xcbWindow.cpp +++ b/senseApis/xcbWindow/xcbWindow.cpp @@ -312,15 +312,17 @@ static int xcbWindow_detachDeviceReq(const smo::device::SenseDeviceSpec& spec) } ); - if (it != g_attachedWindows.end()) + if (it == g_attachedWindows.end()) { - g_attachedWindows.erase(it); - std::cout << __func__ << ": Detached X11 window device\n"; - return 0; + std::cerr << __func__ << ": Device not found for detachment:\n" + << spec.stringify() << "\n"; + return -1; } - std::cerr << __func__ << ": Device not found for detachment\n"; - return -1; + g_attachedWindows.erase(it); + std::cout << __func__ << ": Detached X11 window device:\n" + << spec.stringify() << "\n"; + return 0; } // SenseApi descriptor