Merge pull request #17 from ua0lnj/master

Version 1.1.1.
vdr-projects · Mar 25, 2021 · 649fa5d · 649fa5d
2 parents eaadde8 + 89b9326
commit 649fa5d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/filebrowser.c b/filebrowser.c
@@ -201,6 +201,7 @@ eOSState cMpvFilebrowser::ProcessKey(eKeys Key)
       // first let VDR handle those keys or we get the previous item
       State = cOsdMenu::ProcessKey(Key);
       item = (cMpvFilebrowserMenuItem *) Get(Current());
+      if (!item) break;
       currentItem = item->Text();
 #ifdef USE_DISC
       SetHelp(tr("Disc"), item->IsDirectory() ? tr("PlayDir") : NULL, tr("Shuffle"), NULL);

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.1.0"
+static const char *VERSION = "1.1.1"
 #ifdef GIT_REV
     "-GIT" GIT_REV
 #endif

diff --git a/player.c b/player.c
@@ -968,6 +968,6 @@ void cMpvPlayer::SetVolume(int Volume)
 {
   if (MpvPluginConfig->SoftVol)
     SendCommand("set volume %d\n", Volume);
-  else
+  else if (PlayerIsRunning())
     mpv_set_property_string(hMpv, "ao-volume", std::to_string(Volume).c_str());
 }