Fix for SVG cache

qgis · Jun 27, 2013 · 104b4d9 · 104b4d9
1 parent 59222a0
commit 104b4d9
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/core/symbology-ng/qgssvgcache.cpp b/src/core/symbology-ng/qgssvgcache.cpp
@@ -136,7 +136,10 @@ const QImage& QgsSvgCache::svgAsImage( const QString& file, double size, const Q
       //currentEntry->image = new QImage( 0, 0 );
 
       // instead cache picture
-      cachePicture( currentEntry );
+      if ( !currentEntry->picture )
+      {
+        cachePicture( currentEntry );
+      }
     }
     else
     {
@@ -693,6 +696,11 @@ void QgsSvgCache::printEntryList()
 
 void QgsSvgCache::trimToMaximumSize()
 {
+  //only one entry in cache
+  if ( mLeastRecentEntry == mMostRecentEntry )
+  {
+    return;
+  }
   QgsSvgCacheEntry* entry = mLeastRecentEntry;
   while ( entry && ( mTotalSize > mMaximumSize ) )
   {