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

List:       kde-commits
Subject:    branches/KDE/4.2/kdeedu/marble/src/lib
From:       Torsten Rahn <tackat () kde ! org>
Date:       2009-02-02 23:29:55
Message-ID: 1233617395.719940.9957.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 920473 by rahn:



n't crash if Marble doesn't find its plugins


M    PluginManager.cpp


 M  +8 -5      PluginManager.cpp  


--- branches/KDE/4.2/kdeedu/marble/src/lib/PluginManager.cpp #920472:920473
@@ -92,13 +92,16 @@
         qDebug() << fileName << " - " << MarbleDirs::pluginPath( fileName );
         QPluginLoader loader( MarbleDirs::pluginPath( fileName ) );
 
-        QObject *obj = loader.instance();
-        MarbleRenderPlugin* layerPlugin = qobject_cast<MarbleRenderPlugin *>(obj);
-        MarbleRenderPlugin* instance = layerPlugin->instance();
+        QObject * obj = loader.instance();
 
-        if( layerPlugin && instance ) {
-            d->m_renderPlugins.append( instance );
+        MarbleRenderPlugin * layerPlugin;
+        if ( obj ) {
+            layerPlugin = qobject_cast<MarbleRenderPlugin *>(obj);
         }
+
+        if( obj && layerPlugin ) {
+            d->m_renderPlugins.append( layerPlugin );
+        }
         else {
             qDebug() << "Plugin Failure: " << fileName << " is not a valid Marble Plugin:";
             qDebug() << loader.errorString();
[prev in list] [next in list] [prev in thread] [next in thread]