[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:29:49
Message-ID: 1233689389.848274.2476.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 920779 by rahn:

- Backporting thread fixes for PntMapLoader and PlaceMarkLoader ...



 M  +7 -2      GeoPolygon.cpp  
 M  +8 -1      PlaceMarkManager.cpp  
 M  +1 -0      SunControlWidget.cpp  


--- branches/KDE/4.2/kdeedu/marble/src/lib/GeoPolygon.cpp #920778:920779
@@ -112,7 +112,10 @@
 }
 
 PntMap::~PntMap()
-{
+{   
+    if ( m_loader ) {
+        m_loader->wait();
+    }
     qDeleteAll( begin(), end() );
 }
 
@@ -126,8 +129,10 @@
 
 void PntMap::setInitialized( bool isInitialized )
 {
-    if ( m_loader->isFinished() )
+    if ( m_loader->isFinished() ) {
         delete m_loader;
+        m_loader = 0;
+    }
 
     m_isInitialized = isInitialized;
     emit initialized();
--- branches/KDE/4.2/kdeedu/marble/src/lib/PlaceMarkManager.cpp #920778:920779
@@ -99,9 +99,16 @@
 
 void PlaceMarkManager::cleanupLoader( PlaceMarkLoader* loader )
 {
+    foreach( PlaceMarkLoader *loader, m_loaderList ) {
+        if ( loader ) {
+            loader->wait();
+        }
+    }
+
     m_loaderList.removeAll( loader );
     if ( loader->isFinished() ) {
-         delete loader;
+        delete loader;
+        loader = 0;
     }
 }
 
--- branches/KDE/4.2/kdeedu/marble/src/lib/SunControlWidget.cpp #920778:920779
@@ -75,6 +75,7 @@
         m_sunLocator->setCitylights( false );
     else if ( index == 1 )
         m_sunLocator->setCitylights( true );
+    m_sunLocator->update();
 }
 
 void SunControlWidget::centerSunClicked(bool checked)
[prev in list] [next in list] [prev in thread] [next in thread]