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

[Thibaut Gridel]

SVN commit 1074769 by tgridel:

backport of r1074768 FileLoader: disable .cache file for non "standard placemark" files

 M  +6 -3      FileLoader.cpp  


--- branches/KDE/4.4/kdeedu/marble/src/lib/FileLoader.cpp #1074768:1074769
@@ -68,13 +68,13 @@
 
         if ( fileinfo.isAbsolute() ) {
             // We got an _absolute_ path now: e.g. "/patrick.kml"
-            defaultcachename = path + '/' + name + ".cache";
+            // defaultcachename = path + '/' + name + ".cache";
             defaultsrcname   = path + '/' + name + '.' + suffix;
         }
         else {
             if ( m_filepath.contains( '/' ) ) {
                 // _relative_ path: "maps/mars/viking/patrick.kml"
-                defaultcachename = MarbleDirs::path( path + '/' + name + ".cache" );
+                // defaultcachename = MarbleDirs::path( path + '/' + name + ".cache" );
                 defaultsrcname   = MarbleDirs::path( path + '/' + name + '.' + suffix);
             }
             else {
@@ -120,7 +120,10 @@
             {
                 // Read the KML file.
                 importKml( defaultsrcname );
-                saveFile( defaultcachename );
+                if ( ! defaultcachename.isEmpty() )
+                {
+                    saveFile( defaultcachename );
+                }
             }
             else
             {