apps/plugins/pictureflow/pictureflow.c

@@ -1398,7 +1398,7 @@ static int create_album_index(void)
     /* Albums */
     pf_idx.album_ct = 0;
     pf_idx.album_len =0;
-    pf_idx.album_untagged_idx = -1;
+    pf_idx.album_untagged_idx = 0;
     pf_idx.album_untagged_seek = -1;
 
     /* album_index starts at end of buf it will be rearranged when finalized */
@@ -1523,8 +1523,16 @@ retry_artist_lookup:
 
     /* remove any extra untagged albums
      * extra space is orphaned till restart */
-    pf_idx.album_index += pf_idx.album_untagged_idx + 1;
+    for (i = 0; i < pf_idx.album_ct; i++)
-    pf_idx.album_ct -= pf_idx.album_untagged_idx + 1;
+    {
+        if (pf_idx.album_index[i].artist_idx > 0)
+        {
+            if (i > 0) { i--; }
+            pf_idx.album_index += i;
+            pf_idx.album_ct -= i;
+            break;
+        }
+    }
 
     pf_idx.buf = buf;
     pf_idx.buf_sz = buf_size;

apps/shortcuts.c

@@ -821,7 +821,7 @@ int do_shortcut_menu(void *ignored)
                     run_debug_screen(sc->u.path);
                     break;
                 case SHORTCUT_SHUTDOWN:
-#if CONFIG_CHARGING && !defined(HAVE_POWEROFF_WHILE_CHARGING)
+#if CONFIG_CHARGING
                     if (charger_inserted())
                         charging_splash();
                     else
@@ -829,7 +829,7 @@ int do_shortcut_menu(void *ignored)
                         sys_poweroff();
                     break;
                 case SHORTCUT_REBOOT:
-#if CONFIG_CHARGING && !defined(HAVE_POWEROFF_WHILE_CHARGING)
+#if CONFIG_CHARGING
                     if (charger_inserted())
                         charging_splash();
                     else