1 files changed, 17 insertions, 8 deletions

diff --git a/apps/misc.c b/apps/misc.c
index d8caabd397..0bbaba965b 100644
--- a/apps/misc.c
+++ b/apps/misc.c
@@ -139,7 +139,7 @@ const unsigned char * const unit_strings_core[] =
  * voiced.*/
 char *output_dyn_value(char *buf,
                        int buf_size,
-                       int value,
+                       int64_t value,
                        const unsigned char * const *units,
                        unsigned int unit_count,
                        bool binary_scale)
@@ -147,8 +147,9 @@ char *output_dyn_value(char *buf,
     unsigned int scale = binary_scale ? 1024 : 1000;
     unsigned int fraction = 0;
     unsigned int unit_no = 0;
-    unsigned int value_abs = (value < 0) ? -value : value;
+    uint64_t value_abs = (value < 0) ? -value : value;
     char tbuf[5];
+    int value2;
 
     while (value_abs >= scale && unit_no < (unit_count - 1))
     {
@@ -157,7 +158,7 @@ char *output_dyn_value(char *buf,
         unit_no++;
     }
 
-    value = (value < 0) ? -value_abs : value_abs; /* preserve sign */
+    value2 = (value < 0) ? -value_abs : value_abs; /* preserve sign */
     fraction = (fraction * 1000 / scale) / 10;
 
     if (value_abs >= 100 || fraction >= 100 || !unit_no)
@@ -170,10 +171,10 @@ char *output_dyn_value(char *buf,
     if (buf)
     {
         if (*tbuf)
-            snprintf(buf, buf_size, "%d%s%s%s", value, str(LANG_POINT),
+            snprintf(buf, buf_size, "%d%s%s%s", value2, str(LANG_POINT),
                      tbuf, P2STR(units[unit_no]));
         else
-            snprintf(buf, buf_size, "%d%s", value, P2STR(units[unit_no]));
+            snprintf(buf, buf_size, "%d%s", value2, P2STR(units[unit_no]));
     }
     else
     {
@@ -200,7 +201,7 @@ bool warn_on_pl_erase(void)
         return true;
 }
 
-bool show_search_progress(bool init, int count)
+bool show_search_progress(bool init, int display_count, int current, int total)
 {
     static int last_tick = 0;
 
@@ -214,7 +215,15 @@ bool show_search_progress(bool init, int count)
     /* Update progress every 1/10 of a second */
     if (TIME_AFTER(current_tick, last_tick + HZ/10))
     {
-        splashf(0, str(LANG_PLAYLIST_SEARCH_MSG), count, str(LANG_OFF_ABORT));
+        if (total != current)
+        {
+            splash_progress(current, total, str(LANG_PLAYLIST_SEARCH_MSG),
+                            display_count, str(LANG_OFF_ABORT));
+        }
+        else
+            splashf(0, str(LANG_PLAYLIST_SEARCH_MSG),
+                    display_count, str(LANG_OFF_ABORT));
+
         if (action_userabort(TIMEOUT_NOBLOCK))
             return false;
         last_tick = current_tick;
@@ -1843,7 +1852,7 @@ enum current_activity get_current_activity(void)
 * ** Extended error info truth table **
 *  [ Handle ][buf_reqd]
 *  [  > 0   ][  > 0   ] buf_reqd indicates how many bytes were used
-*  [ALOC_ERR][  > 0   ] buf_reqd indicates how many bytes are needed 
+*  [ALOC_ERR][  > 0   ] buf_reqd indicates how many bytes are needed
 *  [ALOC_ERR][READ_ERR] there was an error reading the file or it is empty
 */
 int core_load_bmp(const char * filename, struct bitmap *bm, const int bmformat,