Skip to content

Commit ac80df6

Browse files
authored
Merge pull request #35 from ua0lnj/master
Update to 1.5.2.
2 parents 08e32e0 + e282b07 commit ac80df6

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

filebrowser.c

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,7 @@ eOSState cMpvFilebrowser::ProcessKey(eKeys Key)
269269
{
270270
int res;
271271
res = PlayListCreate(newPath, NULL);
272+
ShowDirectory(currentDir);
272273
if (res != -1)
273274
{
274275
Skins.Message(mtError, tr("Not empty directory, can't remove!"));
@@ -281,21 +282,36 @@ eOSState cMpvFilebrowser::ProcessKey(eKeys Key)
281282
if (res)
282283
{
283284
Skins.Message(mtError, tr("Unable to remove directory!"));
285+
ShowDirectory(currentDir);
286+
}
287+
else
288+
{
289+
State = cOsdMenu::ProcessKey(kUp);
290+
item = (cMpvFilebrowserMenuItem *) Get(Current());
291+
if (!item) break;
292+
currentItem = item->Text();
293+
ShowDirectory(currentDir);
294+
return State;
284295
}
285296
}
286297
}
287-
ShowDirectory(currentDir);
288298
}
289299
else
290300
{
291301
if (Skins.Message(mtWarning, tr("Remove file?"), 5) == kOk)
292302
{
293303
int res;
294304
res = remove(newPath.c_str());
305+
ShowDirectory(currentDir);
295306
if (res)
296307
{
297308
Skins.Message(mtError, tr("Unable to remove file!"));
298309
}
310+
else
311+
{
312+
State = cOsdMenu::ProcessKey(kUp);
313+
return State;
314+
}
299315
}
300316
}
301317
return osContinue;

mpv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include "menu_options.h"
2020
#include "mpv_service.h"
2121

22-
static const char *VERSION = "1.5.0"
22+
static const char *VERSION = "1.5.2"
2323
#ifdef GIT_REV
2424
"-GIT" GIT_REV
2525
#endif

0 commit comments

Comments
 (0)