[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/kstyles/oxygen
From:       Luboš Luňák <l.lunak () kde ! org>
Date:       2010-10-20 20:16:38
Message-ID: 20101020201638.DC6C3AC897 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1187937 by lunakl:

The changes in r1167224 made drawToolButtonComplexControl() lose
the widget == NULL check, and now the code crashes in that code.
So putting that check back the way it seemed to be before, if
this is not right, please fix properly.

CCMAIL: Hugo Pereira Da Costa <hugo.pereira@free.fr>



 M  +2 -0      oxygenstyle.cpp  


--- trunk/KDE/kdebase/workspace/kstyles/oxygen/oxygenstyle.cpp #1187936:1187937
@@ -7522,6 +7522,8 @@
     //______________________________________________________________
     bool Style::drawToolButtonComplexControl( const QStyleOptionComplex* option, \
QPainter* painter, const QWidget* widget ) const  {
+        if( !widget ) return false;
+
         // check autoRaise state
         const State flags( option->state );
         const bool isInToolBar( widget && qobject_cast<QToolBar*>( widget->parent() \
) );


[prev in list] [next in list] [prev in thread] [next in thread]