Fixed a nasty null pointer reference during window icon change.
svn path=/trunk/kdebase/kwin/; revision=98374
This commit is contained in:
parent
b975b5622b
commit
cba4ba635d
1 changed files with 9 additions and 5 deletions
|
@ -1128,13 +1128,15 @@ void IceWMClient::mouseDoubleClickEvent( QMouseEvent * e )
|
||||||
void IceWMClient::iconChange()
|
void IceWMClient::iconChange()
|
||||||
{
|
{
|
||||||
if (validPixmaps(menuButtonPix) && showMenuButtonIcon)
|
if (validPixmaps(menuButtonPix) && showMenuButtonIcon)
|
||||||
|
{
|
||||||
|
if (button[BtnSysMenu])
|
||||||
{
|
{
|
||||||
renderMenuIcons();
|
renderMenuIcons();
|
||||||
button[BtnSysMenu]->usePixmap( &menuButtonWithIconPix );
|
button[BtnSysMenu]->usePixmap( &menuButtonWithIconPix );
|
||||||
|
|
||||||
if (button[BtnSysMenu]->isVisible())
|
if (button[BtnSysMenu]->isVisible())
|
||||||
button[BtnSysMenu]->repaint(false);
|
button[BtnSysMenu]->repaint(false);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -1310,3 +1312,5 @@ extern "C"
|
||||||
|
|
||||||
|
|
||||||
#include "icewm.moc"
|
#include "icewm.moc"
|
||||||
|
|
||||||
|
// vim: ts=4
|
||||||
|
|
Loading…
Reference in a new issue