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

List:       kde-commits
Subject:    KDE/kdelibs/plasma/extenders
From:       Marco Martin <notmart () gmail ! com>
Date:       2010-12-30 18:10:55
Message-ID: 20101230181055.EDD34AC8AC () svn ! kde ! org
[Download RAW message or body]

SVN commit 1210334 by mart:

be more paranoid in checking for pointers
BUG:261570


 M  +5 -2      extenderitem.cpp  


--- trunk/KDE/kdelibs/plasma/extenders/extenderitem.cpp #1210333:1210334
@@ -190,10 +190,13 @@
         d->group = hostExtender->d->findGroup(groupName);
 
         //Find the sourceapplet.
-        Corona *corona = hostExtender->d->applet.data()->containment()->corona();
+        Corona *corona = 0;
+        if (hostExtender && hostExtender->d->applet && hostExtender->d->applet.data()->containment()) {
+            corona = hostExtender->d->applet.data()->containment()->corona();
+        }
         if (sourceAppletId == hostExtender->applet()->id()) {
             d->sourceApplet = hostExtender->applet();
-        } else {
+        } else if (corona) {
             foreach (Containment *containment, corona->containments()) {
                 foreach (Applet *applet, containment->applets()) {
                     if (applet->id() == sourceAppletId &&
[prev in list] [next in list] [prev in thread] [next in thread]