summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2024-07-17 12:52:50 +0200
committerRémi Verschelde <rverschelde@gmail.com>2024-07-17 12:52:50 +0200
commit64a11d08ccc8cadee04814854e46ea64cf36fe68 (patch)
tree9bdcaab260a492eaef69f91152bd3c284eb9fac2
parentd191bee0ae760a24b72d4c8dde03f11f278d389a (diff)
parent84f26a629d5cc63d7297df503ba0a8fe9f45dc15 (diff)
downloadredot-engine-64a11d08ccc8cadee04814854e46ea64cf36fe68.tar.gz
Merge pull request #94411 from Riteo/suspending-the-right-way
Wayland: Check for suspended flag when unsuspending
-rw-r--r--platform/linuxbsd/wayland/display_server_wayland.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/linuxbsd/wayland/display_server_wayland.cpp b/platform/linuxbsd/wayland/display_server_wayland.cpp
index adc9beed66..93096fcdcc 100644
--- a/platform/linuxbsd/wayland/display_server_wayland.cpp
+++ b/platform/linuxbsd/wayland/display_server_wayland.cpp
@@ -1238,7 +1238,7 @@ void DisplayServerWayland::process_events() {
} else {
try_suspend();
}
- } else if (wayland_thread.get_reset_frame()) {
+ } else if (!wayland_thread.is_suspended() || wayland_thread.get_reset_frame()) {
// At last, a sign of life! We're no longer suspended.
suspended = false;
}