summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2007-08-08 07:27:07 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2007-08-08 07:27:07 +0000
commitd7d2e69092936a049c4c8ed51cc2c750d8ca2157 (patch)
tree6b2322393ea0d519e648b90c370a0521f7e01123
parent50c81a9ca24a06bc949cd4daa01f9f85d140752c (diff)
downloadrockbox-d7d2e69092936a049c4c8ed51cc2c750d8ca2157.zip
rockbox-d7d2e69092936a049c4c8ed51cc2c750d8ca2157.tar.gz
rockbox-d7d2e69092936a049c4c8ed51cc2c750d8ca2157.tar.bz2
rockbox-d7d2e69092936a049c4c8ed51cc2c750d8ca2157.tar.xz
Fix FS#7557 - bug which caused plugins to look for their config/hiscore files in the / folder instead of their folder
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14239 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/plugin.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/apps/plugin.c b/apps/plugin.c
index 660f6e9..1935297 100644
--- a/apps/plugin.c
+++ b/apps/plugin.c
@@ -508,7 +508,6 @@ int plugin_load(const char* plugin, void* parameter)
{
int rc;
struct plugin_header *hdr;
- const char *p = strrchr(plugin,'/');
#ifdef SIMULATOR
void *pd;
#else
@@ -524,12 +523,9 @@ int plugin_load(const char* plugin, void* parameter)
fb_data* old_backdrop;
#endif
- if (!p)
- p = plugin;
-
if (pfn_tsr_exit != NULL) /* if we have a resident old plugin: */
{
- if (pfn_tsr_exit(!strcmp(current_plugin,p)) == false )
+ if (pfn_tsr_exit(!strcmp(current_plugin, plugin)) == false )
{
/* not allowing another plugin to load */
return PLUGIN_OK;
@@ -539,7 +535,7 @@ int plugin_load(const char* plugin, void* parameter)
}
gui_syncsplash(0, ID2P(LANG_WAIT));
- strcpy(current_plugin,p);
+ strcpy(current_plugin, plugin);
#ifdef SIMULATOR
hdr = sim_plugin_load((char *)plugin, &pd);