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

List:       kde-commits
Subject:    branches/KDE/4.2/kdebase/workspace/plasma/applets/kickoff/simpleapplet
From:       Sebastian Sauer <mail () dipe ! org>
Date:       2009-03-10 22:54:13
Message-ID: 1236725653.439473.18665.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 937993 by sebsauer:

the backtrace from bug #186599 says this can happen. so, let's fix it
the dirty way (dirty cause the assert means, that Applet::init got
called more then once, hmmmmm....)


 M  +5 -4      simpleapplet.cpp  


--- branches/KDE/4.2/kdebase/workspace/plasma/applets/kickoff/simpleapplet/simpleapplet.cpp \
#937992:937993 @@ -250,10 +250,11 @@
         connect(menueditor, SIGNAL(triggered(bool)), this, SLOT(startMenuEditor()));
     }
 
-    Q_ASSERT(! d->switcher);
-    d->switcher = new QAction(i18n("Switch to Kickoff Menu Style"), this);
-    d->actions.append(d->switcher);
-    connect(d->switcher, SIGNAL(triggered(bool)), this, SLOT(switchMenuStyle()));
+    if (! d->switcher) {
+        d->switcher = new QAction(i18n("Switch to Kickoff Menu Style"), this);
+        d->actions.append(d->switcher);
+        connect(d->switcher, SIGNAL(triggered(bool)), this, \
SLOT(switchMenuStyle())); +    }
 
     constraintsEvent(Plasma::ImmutableConstraint);
 }


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