From 1d6ac05a8c0f54666bba830227abaaae72d1366d Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Mon, 25 Sep 2023 10:46:32 +0300 Subject: [PATCH] autotests: Make testServerSideDecoration test more robust The test fails sometimes with "Tried to add event to destroyed queue". It does so because the event queue is not destroyed last. See also 33827bbdbe76b8948814273ea9211b0c0dff536c for more details. --- .../autotests/client/test_server_side_decoration.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/wayland/autotests/client/test_server_side_decoration.cpp b/src/wayland/autotests/client/test_server_side_decoration.cpp index 89b791f78e..b782f8bc32 100644 --- a/src/wayland/autotests/client/test_server_side_decoration.cpp +++ b/src/wayland/autotests/client/test_server_side_decoration.cpp @@ -143,14 +143,16 @@ void TestServerSideDecoration::cleanup() delete m_serverSideDecorationManager; m_serverSideDecorationManager = nullptr; } - if (m_queue) { - delete m_queue; - m_queue = nullptr; - } if (m_registry) { delete m_registry; m_registry = nullptr; } + + if (m_queue) { + delete m_queue; + m_queue = nullptr; + } + if (m_thread) { m_thread->quit(); m_thread->wait();