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.tar.gz
rockbox-d7d2e69092936a049c4c8ed51cc2c750d8ca2157.zip
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 660f6e9294..1935297a26 100644
--- a/apps/plugin.c
+++ b/apps/plugin.c
@@ -508,7 +508,6 @@ int plugin_load(const char* plugin, void* parameter)
508{ 508{
509 int rc; 509 int rc;
510 struct plugin_header *hdr; 510 struct plugin_header *hdr;
511 const char *p = strrchr(plugin,'/');
512#ifdef SIMULATOR 511#ifdef SIMULATOR
513 void *pd; 512 void *pd;
514#else 513#else
@@ -524,12 +523,9 @@ int plugin_load(const char* plugin, void* parameter)
524 fb_data* old_backdrop; 523 fb_data* old_backdrop;
525#endif 524#endif
526 525
527 if (!p)
528 p = plugin;
529
530 if (pfn_tsr_exit != NULL) /* if we have a resident old plugin: */ 526 if (pfn_tsr_exit != NULL) /* if we have a resident old plugin: */
531 { 527 {
532 if (pfn_tsr_exit(!strcmp(current_plugin,p)) == false ) 528 if (pfn_tsr_exit(!strcmp(current_plugin, plugin)) == false )
533 { 529 {
534 /* not allowing another plugin to load */ 530 /* not allowing another plugin to load */
535 return PLUGIN_OK; 531 return PLUGIN_OK;
@@ -539,7 +535,7 @@ int plugin_load(const char* plugin, void* parameter)
539 } 535 }
540 536
541 gui_syncsplash(0, ID2P(LANG_WAIT)); 537 gui_syncsplash(0, ID2P(LANG_WAIT));
542 strcpy(current_plugin,p); 538 strcpy(current_plugin, plugin);
543 539
544#ifdef SIMULATOR 540#ifdef SIMULATOR
545 hdr = sim_plugin_load((char *)plugin, &pd); 541 hdr = sim_plugin_load((char *)plugin, &pd);