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

List:       kde-commits
Subject:    KDE/kdeedu/marble/src/lib/geodata/scene
From:       Torsten Rahn <tackat () kde ! org>
Date:       2010-05-03 13:35:01
Message-ID: 20100503133501.4AA96AC8AA () svn ! kde ! org
[Download RAW message or body]

SVN commit 1122294 by rahn:

- Fix crash for bluemarble and other themes due to uninitialized
  GeoSceneTexture::m_storageLayoutMode.



 M  +5 -2      GeoSceneTexture.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/geodata/scene/GeoSceneTexture.cpp #1122293:1122294
@@ -32,8 +32,9 @@
 
 GeoSceneTexture::GeoSceneTexture( const QString& name )
     : GeoSceneAbstractDataset( name ),
-      m_sourceDir( "" ),
-      m_installMap( "" ),
+      m_sourceDir(),
+      m_installMap(),
+      m_storageLayoutMode(Marble),
       m_serverLayout( new MarbleServerLayout( this ) ),
       m_levelZeroColumns( defaultLevelZeroColumns ),
       m_levelZeroRows( defaultLevelZeroRows ),
@@ -154,6 +155,8 @@
     QString relFileName;
 
     switch ( m_storageLayoutMode ) {
+    default:
+        mDebug() << Q_FUNC_INFO << "Invalid storage layout mode! Falling back to default.";
     case GeoSceneTexture::Marble:
         relFileName = QString( "%1/%2/%3/%3_%4.%5" )
             .arg( themeStr() )
[prev in list] [next in list] [prev in thread] [next in thread]