From 8273c0e70b8adc6933baa0f49c32a72d88728794 Mon Sep 17 00:00:00 2001 From: Nick Bolton Date: Wed, 6 Nov 2024 16:45:43 +0000 Subject: [PATCH] chore: Replace screen leave/enter asserts with warnings --- src/lib/deskflow/Screen.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/lib/deskflow/Screen.cpp b/src/lib/deskflow/Screen.cpp index 84dfcdf84..f3581201c 100644 --- a/src/lib/deskflow/Screen.cpp +++ b/src/lib/deskflow/Screen.cpp @@ -125,9 +125,12 @@ void Screen::disable() void Screen::enter(KeyModifierMask toggleMask) { - assert(m_entered == false); LOG((CLOG_INFO "entering screen")); + if (m_entered) { + LOG_WARN("screen already entered"); + } + // now on screen m_entered = true; @@ -141,9 +144,12 @@ void Screen::enter(KeyModifierMask toggleMask) bool Screen::leave() { - assert(m_entered == true); LOG((CLOG_INFO "leaving screen")); + if (!m_entered) { + LOG_WARN("screen already left"); + } + if (!m_screen->canLeave()) { return false; }