From: skeezix <skeezix@flotsam-vm.(none)>
Date: Fri, 28 May 2010 16:02:11 +0000 (-0400)
Subject: fix for mmenu caching; when caching preview, use the appdata dirname if specified... 
X-Git-Tag: sz_beta3~157
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-libraries.git;a=commitdiff_plain;h=f81cd920063e032c3099c82982b72d95c90314bb

fix for mmenu caching; when caching preview, use the appdata dirname if specified, so as to not cause pnd_run.sh to create a unique-id directory, when everything else will use appdata dirname
---

diff --git a/minimenu/mmcache.c b/minimenu/mmcache.c
index 4480a12..691a2cc 100644
--- a/minimenu/mmcache.c
+++ b/minimenu/mmcache.c
@@ -103,16 +103,23 @@ unsigned char cache_preview ( pnd_disco_t *app, unsigned int maxwidth, unsigned
     }
   }
 
+  // unique-id to use for the cache mount
+  char *uid = app -> unique_id;
+
+  if ( app -> appdata_dirname ) {
+    uid = app -> appdata_dirname;
+  }
+
   // if we don't have a file path sorted out yet, means we need to mount and figure it
   if ( ! filepath [ 0 ] ) {
     sprintf ( fullpath, "%s/%s", app -> object_path, app -> object_filename );
 
-    if ( ! pnd_pnd_mount ( pnd_run_script, fullpath, app -> unique_id ) ) {
+    if ( ! pnd_pnd_mount ( pnd_run_script, fullpath, uid ) ) {
       pnd_log ( pndn_debug, "Couldn't mount '%s' for preview\n", fullpath );
       return ( 0 ); // couldn't mount?!
     }
 
-    sprintf ( filepath, "%s/%s/%s", PND_MOUNT_PATH, app -> unique_id, app -> preview_pic1 );
+    sprintf ( filepath, "%s/%s/%s", PND_MOUNT_PATH, uid, app -> preview_pic1 );
   }
 
   // load whatever path we've got
@@ -121,7 +128,7 @@ unsigned char cache_preview ( pnd_disco_t *app, unsigned int maxwidth, unsigned
   if ( ! s ) {
     // unmount it, if mounted
     if ( fullpath [ 0 ] ) {
-      pnd_pnd_unmount ( pnd_run_script, fullpath, app -> unique_id );
+      pnd_pnd_unmount ( pnd_run_script, fullpath, uid );
     }
     pnd_log ( pndn_debug, "Couldn't open image '%s' for preview\n", filepath );
     return ( 0 );