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

List:       kde-commits
Subject:    branches/KDE/4.4/kdelibs/plasma
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2010-03-10 21:42:58
Message-ID: 1268257378.145050.6934.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1101774 by aseigo:

protect against stupid DataEngineScript implementations


 M  +6 -3      dataengine.cpp  


--- branches/KDE/4.4/kdelibs/plasma/dataengine.cpp #1101773:1101774
@@ -75,10 +75,13 @@
 Service *DataEngine::serviceForSource(const QString &source)
 {
     if (d->script) {
-        return d->script->serviceForSource(source);
-    } else {
-        return new NullService(source, this);
+        Service * s = d->script->serviceForSource(source);
+        if (s) {
+            return s;
+        }
     }
+
+    return new NullService(source, this);
 }
 
 void DataEngine::connectSource(const QString &source, QObject *visualization,
[prev in list] [next in list] [prev in thread] [next in thread]