[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-03 19:54:57
Message-ID: 1233690897.446362.6660.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 920796 by rahn:

- This fixes the reported issue behind 182866 -- still a crash away from a full fix ...



 M  +7 -8      PlaceMarkManager.cpp  


--- branches/KDE/4.2/kdeedu/marble/src/lib/PlaceMarkManager.cpp #920795:920796
@@ -45,6 +45,12 @@
 
 PlaceMarkManager::~PlaceMarkManager()
 {
+    foreach( PlaceMarkLoader *loader, m_loaderList ) {
+        if ( loader ) {
+            loader->wait();
+        }
+    }
+
     delete m_model;
     /* do not delete the m_geomodel here
      * it is not this models property
@@ -99,16 +105,9 @@
 
 void PlaceMarkManager::cleanupLoader( PlaceMarkLoader* loader )
 {
-    foreach( PlaceMarkLoader *loader, m_loaderList ) {
-        if ( loader ) {
-            loader->wait();
-        }
-    }
-
     m_loaderList.removeAll( loader );
     if ( loader->isFinished() ) {
-        delete loader;
-        loader = 0;
+         delete loader;
     }
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]