merged crash fix

This commit is contained in:
Henrik Kinnunen 2011-02-23 07:54:20 +01:00
commit 23d67b7f14

View file

@ -129,6 +129,9 @@ WinClient::~WinClient() {
fbdbg<<__FILE__<<"(~"<<__FUNCTION__<<")[this="<<this<<"]"<<endl; fbdbg<<__FILE__<<"(~"<<__FUNCTION__<<")[this="<<this<<"]"<<endl;
FbTk::EventManager::instance()->remove(window()); FbTk::EventManager::instance()->remove(window());
Fluxbox *fluxbox = Fluxbox::instance();
if (window())
fluxbox->removeWindowSearch(window());
clearStrut(); clearStrut();
@ -160,8 +163,6 @@ WinClient::~WinClient() {
removeTransientFromWaitingList(); removeTransientFromWaitingList();
s_transient_wait.erase(window()); s_transient_wait.erase(window());
Fluxbox *fluxbox = Fluxbox::instance();
if (window_group != 0) { if (window_group != 0) {
fluxbox->removeGroupSearch(window_group); fluxbox->removeGroupSearch(window_group);
window_group = 0; window_group = 0;
@ -170,8 +171,6 @@ WinClient::~WinClient() {
if (m_mwm_hint != 0) if (m_mwm_hint != 0)
XFree(m_mwm_hint); XFree(m_mwm_hint);
if (window())
fluxbox->removeWindowSearch(window());
} }
bool WinClient::acceptsFocus() const { bool WinClient::acceptsFocus() const {