2 files changed, 25 insertions, 2 deletions

diff --git a/apps/filetypes.c b/apps/filetypes.c
index 4e88f81dec..0f9f0c790a 100644
--- a/apps/filetypes.c
+++ b/apps/filetypes.c
@@ -246,6 +246,13 @@ int filetype_load_menu(struct menu_item*  menu,int max_items)
     {
         if (filetypes[i].plugin)
         {
+            int j;
+            for (j=0;j<cnt;j++) /* check if the plugin is in the list yet */
+            {
+                if (!strcmp(menu[j].desc,filetypes[i].plugin))
+                    break;
+            }
+            if (j<cnt) continue; /* it is so grab the next plugin */
             cp=strrchr(filetypes[i].plugin,'/');
             if (cp) cp++;
             else    cp=filetypes[i].plugin;
@@ -261,9 +268,25 @@ int filetype_load_menu(struct menu_item*  menu,int max_items)
 /* start a plugin with an argument (called from onplay.c) */
 int filetype_load_plugin(const char* plugin, char* file)
 {
+    int fd;
     snprintf(plugin_name,sizeof(plugin_name),"%s/%s.rock",
              VIEWERS_DIR,plugin);
-    return plugin_load(plugin_name,file);
+    if ((fd = open(plugin_name,O_RDONLY))>=0)
+    {
+        close(fd);
+        return plugin_load(plugin_name,file);
+    }
+    else
+    { 
+        snprintf(plugin_name,sizeof(plugin_name),"%s/%s.rock",
+             PLUGIN_DIR,plugin);
+        if ((fd = open(plugin_name,O_RDONLY))>=0)
+        {
+            close(fd);
+            return plugin_load(plugin_name,file);
+        }
+    }
+    return PLUGIN_ERROR;
 }
 
 /* get index to filetypes[] from the file attribute */
diff --git a/apps/onplay.c b/apps/onplay.c
index be11b9a2da..e057623c1c 100644
--- a/apps/onplay.c
+++ b/apps/onplay.c
@@ -628,7 +628,7 @@ int onplay(char* file, int attr, int from)
             }
         }
 
-        if (!(attr & ATTR_DIRECTORY) && attr)
+        if (!(attr & ATTR_DIRECTORY))
         {
             items[i].desc = ID2P(LANG_ONPLAY_OPEN_WITH);
             items[i].function = list_viewers;