fix(tray): Deactivate the tray before removing the bar

This commit is contained in:
Michael Carlberg 2016-10-15 03:58:53 +02:00
parent 4f87db79b8
commit 0bac9c3f89

View File

@ -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) { if (m_traymanager) {
m_log.trace("controller: Deactivate tray manager"); m_log.trace("controller: Deactivate tray manager");
m_traymanager->deactivate(); 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_log.trace("controller: Interrupt X event loop");
m_connection.send_dummy_event(m_connection.root()); m_connection.send_dummy_event(m_connection.root());