From 692efa5cde5eab370889bb0a3d56477d2a533ab1 Mon Sep 17 00:00:00 2001 From: Waldo Bastian Date: Mon, 22 Jan 2001 23:30:08 +0000 Subject: [PATCH] Don't crash when making window sticky/maximized without a sticky/maximized button. svn path=/trunk/kdebase/kwin/; revision=79649 --- clients/kwmtheme/kwmthemeclient.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/clients/kwmtheme/kwmthemeclient.cpp b/clients/kwmtheme/kwmthemeclient.cpp index 018c5ad2eb..4b2cb567bf 100644 --- a/clients/kwmtheme/kwmthemeclient.cpp +++ b/clients/kwmtheme/kwmthemeclient.cpp @@ -203,6 +203,7 @@ KWMThemeClient::KWMThemeClient( Workspace *ws, WId w, QWidget *parent, const char *name ) : Client( ws, w, parent, name, WResizeNoErase | WNorthWestGravity) { + stickyBtn = maxBtn = 0; init_theme(); connect(options, SIGNAL(resetClients()), this, SLOT(slotReset())); QGridLayout *layout = new QGridLayout(this); @@ -482,12 +483,14 @@ void KWMThemeClient::mouseDoubleClickEvent( QMouseEvent * e ) void KWMThemeClient::stickyChange(bool on) { - stickyBtn->setPixmap(on ? *pinupPix : *pindownPix); + if (stickyBtn) + stickyBtn->setPixmap(on ? *pinupPix : *pindownPix); } void KWMThemeClient::maximizeChange(bool m) { - maxBtn->setPixmap(m ? *minmaxPix : *maxPix); + if (maxBtn) + maxBtn->setPixmap(m ? *minmaxPix : *maxPix); } Client::MousePosition KWMThemeClient::mousePosition(const QPoint &p) const