If load-icons-later is 2, then will skip auto loading icons entirely

diff --git a/deployment/etc/pandora/conf/mmenu.conf b/deployment/etc/pandora/conf/mmenu.conf
index 7cd699bb209ce0a1d7094f22a0f4813761d9fcac..aee2fab686574c0c5a47459493cabe310b5cf6b6 100644 (file)
--- a/deployment/etc/pandora/conf/mmenu.conf
+++ b/deployment/etc/pandora/conf/mmenu.conf
@@ -19,8 +19,8 @@ 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?
 load_previews_now      0       # if >0, will try to load preview pics from pnds at boot time, not defer till later
 load_previews_later    1       # if >0, will try to load preview pics sometime (see defer_timer_ms as well)
-load_icons_later       1       # if >0, will try to load icons after grid is showing, not during app scanning
-load_visible_icons     1       # if >0, will try to load visible icons immediately (before render); combine with defered load for non-visible, say.
+load_icons_later       1       # if 0 will load on start; if 1 will load 'later'; if '2' will not auto load icons at all
+load_visible_icons     1       # if >0, will try to load visible icons immediately before render; ie: load as needed
 defer_icon_us          100000  # when background loading icons (load_icons_later), time between icon loadsa
 threaded_preview       0       # if 1, will try to load the preview in background, to avoid slowing up navigation
 loglevel               0       # 0 is debug, lots of crap; 3 is better, means 'errors only'. Output may screw up the wrapper!

diff --git a/minimenu/mmenu.conf b/minimenu/mmenu.conf
index 227f3a446f24cf39ff55363a6df0f3dcc33bf665..f1cb81c155aa47b6c1b0e872b38f0ee35f4d0ae3 100644 (file)
--- a/minimenu/mmenu.conf
+++ b/minimenu/mmenu.conf
@@ -19,8 +19,8 @@ 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?
 load_previews_now      0       # if >0, will try to load preview pics from pnds at boot time, not defer till later
 load_previews_later    0       # if >0, will try to load preview pics sometime (see defer_timer_ms as well)
-load_icons_later       1       # if >0, will try to load icons after grid is showing, not during app scanning
-load_visible_icons     1       # if >0, will try to load visible icons immediately (before render); combine with defered load for non-visible, say.
+load_icons_later       1       # if 0 will load on start; if 1 will load 'later'; if '2' will not auto load icons at all
+load_visible_icons     1       # if >0, will try to load visible icons immediately before render; ie: load as needed
 defer_icon_us          100000  # when background loading icons (load_icons_later), time between icon loadsa
 threaded_preview       0       # if 1, will try to load the preview in background, to avoid slowing up navigation
 loglevel               0       # 0 is debug, lots of crap; 3 is better, means 'errors only'. Output may screw up the wrapper!

diff --git a/minimenu/mmui.c b/minimenu/mmui.c
index 66283b700d6cfe3e1c6a3a1761abeb45237a95cd..bb8a4eff9a6d48f1e91154184be3ff3d8e069bc6 100644 (file)
--- a/minimenu/mmui.c
+++ b/minimenu/mmui.c
@@ -4397,7 +4397,8 @@ char *ui_pick_custom_category ( unsigned char mode ) {
 }
 
 void ui_start_defered_icon_thread ( void ) {
-  if ( pnd_conf_get_as_int_d ( g_conf, "minimenu.load_icons_later", 0 ) == 0 ) {
+
+  if ( pnd_conf_get_as_int_d ( g_conf, "minimenu.load_icons_later", 0 ) != 1 ) {
     return;
   }