Allow moving minimenu custom conf/skins to appdata/mmenu, in addition to /pandora...

diff --git a/deployment/etc/pandora/conf/mmenu.conf b/deployment/etc/pandora/conf/mmenu.conf
index 8ccd975..6a8477c 100644 (file)
--- a/deployment/etc/pandora/conf/mmenu.conf
+++ b/deployment/etc/pandora/conf/mmenu.conf
@@ -13,7 +13,7 @@
 # here, so that skin-changes do not break user preferences
 
 [minimenu]
-skin_searchpath                /media/*/pandora/mmenu/skins:/etc/pandora/mmenu/skins:./minimenu/skin
+skin_searchpath                /media/*/pandora/mmenu/skins:/media/*/pandora/appdata/mmenu/skins:/etc/pandora/mmenu/skins:./minimenu/skin
 skin_selected          ~/.mmenuskinchoice
 skin_confname          mmskin.conf
 pndrun                 /usr/pandora/scripts:./testdata/scripts # searchpath to locate "pnd_run.sh"; why aren't I looking in /etc/pandora/conf/apps for this?

diff --git a/minimenu/mmenu.c b/minimenu/mmenu.c
index 78313f5..7e46761 100644 (file)
--- a/minimenu/mmenu.c
+++ b/minimenu/mmenu.c
@@ -402,10 +402,18 @@ int main ( int argc, char *argv[] ) {
 
 void emit_and_quit ( char *s ) {
   printf ( "%s\n", s );
-  pnd_dbusnotify_shutdown ( dbh );
-  if ( nh ) {
-    pnd_notify_shutdown ( nh );
+  // shutdown notifications
+  if ( g_autorescan ) {
+
+    if ( dbh ) {
+      pnd_dbusnotify_shutdown ( dbh );
+    }
+    if ( nh ) {
+      pnd_notify_shutdown ( nh );
+    }
+
   }
+
   exit ( 0 );
 }