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

[Jens-Michael Hoffmann]

SVN commit 1082155 by jmhoffmann:

Fix annoying bug which only had user visible consequences when using
HttpDownloadManager's downloadComplete( QByteArray ) signal.
When requesting a tile from a lower level for scaling up, the wrong
TileId (HttpJob initiator id) was used. This led to HttpDowbnloadManager
signalling back the requested data with the wrong TileId as thus
displaying the wrong tile.

 M  +2 -3      TextureTile.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/TextureTile.cpp #1082154:1082155
@@ -312,10 +312,9 @@
         bool currentTileAvailable = false;
 
         // Check whether the current tile id is available in the CACHE:
+        const TileId currentTileId( currentLevel, (int)(currentX), (int)(currentY) );
         if ( tileCache ) {
-            TileId currentTileId( currentLevel, (int)(currentX), (int)(currentY) );
             TextureTile *currentTile = tileCache->take( currentTileId );
-
             if ( currentTile ) {
                 // the tile was in the cache, but is it up to date?
                 lastModified = currentTile->created();
@@ -396,7 +395,7 @@
                 TileLoaderHelper::relativeTileFileName( textureLayer, currentLevel,
                                                         currentX, currentY );
 //            mDebug() << "emit downloadTile(" << sourceUrl << destFileName << ");";
-            emit downloadTile( sourceUrl, destFileName, d->m_id.toString(), DownloadBrowse );
+            emit downloadTile( sourceUrl, destFileName, currentTileId.toString(), DownloadBrowse );
         }
     }