[Marble-commits] branches/KDE/4.3/kdeedu/marble/src/lib

[Jens-Michael Hoffmann]

SVN commit 1015504 by jmhoffmann:

Fix crash in case no network plugin was found,
fixed in trunk already with svn revision 1005467.
BUG: 201995


 M  +8 -2      HttpDownloadManager.cpp  


--- branches/KDE/4.3/kdeedu/marble/src/lib/HttpDownloadManager.cpp #1015503:1015504
@@ -110,7 +110,8 @@
     sourceUrl.setPath( path + relativeUrlString );
 
     HttpJob *job = createJob( sourceUrl, relativeUrlString, id );
-    addJob( job );
+    if ( job )
+        addJob( job );
 }
 
 void HttpDownloadManager::addJob( const QUrl& sourceUrl, const QString& destFileName,
@@ -120,7 +121,8 @@
         return;
 
     HttpJob *job = createJob( sourceUrl, destFileName, id );
-    addJob( job );
+    if ( job )
+        addJob( job );
 }
 
 bool HttpDownloadManager::acceptJob( HttpJob  *job )
@@ -278,6 +280,10 @@
             qDeleteAll( networkPlugins );
             m_networkPlugin->setParent( this );
         }
+        else {
+            m_downloadEnabled = false;
+            return 0;
+        }
     }
     Q_ASSERT( m_networkPlugin );
     return m_networkPlugin->createJob( sourceUrl, destFileName, id );