diff options
Diffstat (limited to 'apps/playlist.c')
| -rw-r--r-- | apps/playlist.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/apps/playlist.c b/apps/playlist.c index e54918f4f7..888b53d282 100644 --- a/apps/playlist.c +++ b/apps/playlist.c @@ -2196,25 +2196,23 @@ int playlist_resume(void) char *str1 = NULL; char *str2 = NULL; char *str3 = NULL; - unsigned long last_tick = current_tick + HZ / 2; /* wait 1/2 sec before progress */ + unsigned long last_tick = current_tick; + splash_progress_set_delay(HZ / 2); /* wait 1/2 sec before progress */ bool useraborted = false; for(count=0; count<nread && !exit_loop && !useraborted; count++,p++) { /* Show a splash while we are loading. */ - if (TIME_AFTER(current_tick, last_tick - 1)) + splash_progress((total_read + count), control_file_size, + "%s (%s)", str(LANG_WAIT), str(LANG_OFF_ABORT)); + if (TIME_AFTER(current_tick, last_tick + HZ/4)) { - splash_progress((total_read + count), control_file_size, - "%s (%s)", str(LANG_WAIT), str(LANG_OFF_ABORT)); - if (TIME_AFTER(current_tick, last_tick + HZ/4)) + if (action_userabort(TIMEOUT_NOBLOCK)) { - if (action_userabort(TIMEOUT_NOBLOCK)) - { - useraborted = true; - break; - } - last_tick = current_tick; + useraborted = true; + break; } + last_tick = current_tick; } /* Are we on a new line? */ if((*p == '\n') || (*p == '\r')) |