Ticket #1894: browseicons.2.patch

libs/libmythtv/osdtypes.cpp

@@ -1254 +1254 @@
 {
     QString ckey;
 
-    if (usecache)
-    {   
-        if (!filename.isEmpty() && filename.length() >= 2)
-            ckey = OSDImageCache::CreateKey(filename, wmult, hmult, 
-                                            scalew, scaleh);
-        else 
-            return; // this method requires a backing file
-    }
+    m_isvalid = false;
 
     // Discard any in-cache items..
     if (m_cacheitem && !usecache)
@@ -1277 +1270 @@
         if (m_alpha)
             delete [] m_alpha;
         m_alpha = NULL;
-
-        m_isvalid = false; 
     }
 
+    if (filename.isEmpty() || filename.length() < 2)
+        return;
+
     if (usecache)
     {
+        ckey = OSDImageCache::CreateKey(filename, wmult, hmult, scalew, scaleh);
+
         // Get the item from the cache so it's not freed while in use
         OSDImageCacheValue *value = c_cache.Get(ckey, true);
   
@@ -1295 +1291 @@
             m_alpha     = value->m_alpha;
             m_imagesize = value->m_imagesize;
             m_isvalid   = true;
+            m_filename  = filename;
 
             // Put the old image back to the cache so it can be reused in the
             // future, and possibly freed by the cache system if the size limit
@@ -1333 +1330 @@
     QImage tmp2 = tmpimage.smoothScale(imwidth, imheight);
 
     m_isvalid = true;
+    m_filename = filename;
 
     m_yuv = new unsigned char[imwidth * imheight * 3 / 2];
     m_ybuffer = m_yuv;