From 0bac9c3f8925f443c4d64649fada76f9cf575eda Mon Sep 17 00:00:00 2001 From: Michael Carlberg Date: Sat, 15 Oct 2016 03:58:53 +0200 Subject: [PATCH] fix(tray): Deactivate the tray before removing the bar --- include/components/controller.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/components/controller.hpp b/include/components/controller.hpp index 98a2c17b..0b1d00a7 100644 --- a/include/components/controller.hpp +++ b/include/components/controller.hpp @@ -81,15 +81,15 @@ class controller { } } - m_log.trace("controller: Deconstruct bar instance"); - bar_signals::action_click.disconnect(this, &controller::on_module_click); - m_bar.reset(); - if (m_traymanager) { m_log.trace("controller: Deactivate tray manager"); m_traymanager->deactivate(); } + m_log.trace("controller: Deconstruct bar instance"); + bar_signals::action_click.disconnect(this, &controller::on_module_click); + m_bar.reset(); + m_log.trace("controller: Interrupt X event loop"); m_connection.send_dummy_event(m_connection.root());