1
0
Fork 0
forked from len0rd/rockbox

browse_id3: Only push activity when called from WPS

The Properties plugin and playlist viewer have each
started using the existing Track Info screen.

In both cases, it may not be necessary to push a new
activity. Which eliminates the need to perform an
additional skin refresh.

I've also noticed at least one theme in the wild that
assumes ACTIVITY_ID3SCREEN will only ever display
info for the currently playing track (as it did
previously) and adjusts the skin specifically for
that purpose.

Change-Id: Ic436d0d4e075a865225839a524387ff2b9058428
This commit is contained in:
Christian Soffke 2022-12-30 16:27:55 +01:00
parent 8366b8511d
commit 5750eb3181

View file

@ -699,7 +699,10 @@ bool browse_id3(struct mp3entry *id3, int playlist_display_index, int playlist_a
info.playlist_display_index = playlist_display_index; info.playlist_display_index = playlist_display_index;
info.playlist_amount = playlist_amount; info.playlist_amount = playlist_amount;
bool ret = false; bool ret = false;
push_current_activity(ACTIVITY_ID3SCREEN); int curr_activity = get_current_activity();
if (curr_activity != ACTIVITY_PLUGIN &&
curr_activity != ACTIVITY_PLAYLISTVIEWER)
push_current_activity(ACTIVITY_ID3SCREEN);
for (i = 0; i < ARRAYLEN(id3_headers); i++) for (i = 0; i < ARRAYLEN(id3_headers); i++)
{ {
char temp[8]; char temp[8];
@ -732,8 +735,9 @@ bool browse_id3(struct mp3entry *id3, int playlist_display_index, int playlist_a
} }
} }
} }
if (curr_activity != ACTIVITY_PLUGIN &&
pop_current_activity(); curr_activity != ACTIVITY_PLAYLISTVIEWER)
pop_current_activity();
return ret; return ret;
} }