Merge pull request #35 from ua0lnj/master

Update to 1.5.2.
vdr-projects · Jan 13, 2024 · ac80df6 · ac80df6
2 parents 08e32e0 + e282b07
commit ac80df6
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/filebrowser.c b/filebrowser.c
@@ -269,6 +269,7 @@ eOSState cMpvFilebrowser::ProcessKey(eKeys Key)
       {
         int res;
         res = PlayListCreate(newPath, NULL);
+        ShowDirectory(currentDir);
         if (res != -1)
         {
           Skins.Message(mtError, tr("Not empty directory, can't remove!"));
@@ -281,21 +282,36 @@ eOSState cMpvFilebrowser::ProcessKey(eKeys Key)
             if (res)
             {
               Skins.Message(mtError, tr("Unable to remove directory!"));
+              ShowDirectory(currentDir);
+            }
+            else
+            {
+              State = cOsdMenu::ProcessKey(kUp);
+              item = (cMpvFilebrowserMenuItem *) Get(Current());
+              if (!item) break;
+              currentItem = item->Text();
+              ShowDirectory(currentDir);
+              return State;
             }
           }
         }
-        ShowDirectory(currentDir);
       }
       else
       {
         if (Skins.Message(mtWarning, tr("Remove file?"), 5) == kOk)
         {
           int res;
           res = remove(newPath.c_str());
+          ShowDirectory(currentDir);
           if (res)
           {
             Skins.Message(mtError, tr("Unable to remove file!"));
           }
+          else
+          {
+            State = cOsdMenu::ProcessKey(kUp);
+            return State;
+          }
         }
       }
       return osContinue;

diff --git a/mpv.c b/mpv.c
@@ -19,7 +19,7 @@
 #include "menu_options.h"
 #include "mpv_service.h"
 
-static const char *VERSION = "1.5.0"
+static const char *VERSION = "1.5.2"
 #ifdef GIT_REV
     "-GIT" GIT_REV
 #endif