devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

: [bugfix,bugfix] ensure PREVIOUS tree_context dirfilter is restored on plugin exit

Browse source 
Change-Id: I521e8d660ca76744f5452643578c2f7e5651b870
This commit is contained in:
William Wilgus 2025-01-23 19:50:48 -05:00
parent 36e85ef78a
commit 277c66d9d2
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
apps/plugin.c
View file

@ -949,7 +949,9 @@ int plugin_load(const char* plugin, const void* parameter)
push_current_activity(ACTIVITY_PLUGIN); push_current_activity(ACTIVITY_PLUGIN);
/* some plugins assume the entry cache doesn't move and save pointers to it /* some plugins assume the entry cache doesn't move and save pointers to it
* they should be fixed properly instead of this lock */ * they should be fixed properly instead of this lock */
tree_lock_cache(tree_get_context()); struct tree_context *tc = tree_get_context();
tree_lock_cache(tc);
int *last_dirfilter_p = tc->dirfilter; /* store incoming dirfilter pointer */
if (!theme_enabled) if (!theme_enabled)
FOR_NB_SCREENS(i) FOR_NB_SCREENS(i)
@ -965,11 +967,11 @@ int plugin_load(const char* plugin, const void* parameter)
plugin_check_open_close__enter(); plugin_check_open_close__enter();
int rc = p_hdr->entry_point(parameter); int rc = p_hdr->entry_point(parameter); /* run the loaded plugin */
struct tree_context *tc = tree_get_context(); /* unlock the tree and restore the dirfilter pointer */
tree_unlock_cache(tc); tree_unlock_cache(tc);
tc->dirfilter = &global_settings.dirfilter; tc->dirfilter = last_dirfilter_p;
pop_current_activity_without_refresh(); pop_current_activity_without_refresh();
if (get_current_activity() != ACTIVITY_WPS) if (get_current_activity() != ACTIVITY_WPS)