From c849f2898257df19fddb97ac99c392c410f120d1 Mon Sep 17 00:00:00 2001
From: Martin Prochnow <nordlicht@martins-kabuff.de>
Date: Fri, 31 Mar 2006 19:31:30 +0200
Subject: Version 0.8a - fixed problem when open the plugin while replaying a
 archive dvd; thanks to Monroe from vdr-portal.de for reporting - new version
 of 'dvdarchive.sh'; thanks to vejoun from vdr-portal.de - updated finnish
 translation; thanks to Rolf Ahrenberg

---
 HISTORY               | 6 ++++++
 extrecmenu.h          | 2 +-
 i18n.c                | 6 +++---
 mymenurecordings.c    | 2 +-
 scripts/dvdarchive.sh | 4 ++--
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/HISTORY b/HISTORY
index 5765374..34861d4 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,12 @@
 VDR Plugin 'extrecmenu' Revision History
 ----------------------------------------
 
+2006-03-31: Version 0.8a
+- fixed problem when open the plugin while replaying a archive dvd; thanks to
+  Monroe from vdr-portal.de for reporting
+- new version of 'dvdarchive.sh'; thanks to vejoun from vdr-portal.de
+- updated finnish translation; thanks to Rolf Ahrenberg
+
 2006-03-29: Version 0.8
 - added some logging
 - added option to hide the "new recordings column"
diff --git a/extrecmenu.h b/extrecmenu.h
index af0f89b..687c445 100644
--- a/extrecmenu.h
+++ b/extrecmenu.h
@@ -1,6 +1,6 @@
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.8";
+static const char *VERSION        = "0.8a";
 static const char *DESCRIPTION    = "Extended recordings menu";
 static const char *MAINMENUENTRY  = "ExtRecMenu";
 
diff --git a/i18n.c b/i18n.c
index 8264b8a..a458750 100644
--- a/i18n.c
+++ b/i18n.c
@@ -283,7 +283,7 @@ const tI18nPhrase Phrases[] = {
     "",
     "",
     "",
-    "",
+    "Asemassa ei ole DVD-levyä!",
   },
   { "Error while linking [0-9]*.vdr!",
     "Fehler beim Anlegen der Symlinks [0-9]*.vdr!",
@@ -293,7 +293,7 @@ const tI18nPhrase Phrases[] = {
     "",
     "",
     "",
-    "",
+    "Tiedostojen [0-9]*.vdr linkittäminen epäonnistui!",
   },
   { "Show \"new recordings column\"",
     "\"Neue-Aufzeichnungen-Spalte\" anzeigen",
@@ -303,7 +303,7 @@ const tI18nPhrase Phrases[] = {
     "",
     "",
     "",
-    "",
+    "Näytä \"uudet tallenteet\"-sarake",
   },
   { NULL }
   };
diff --git a/mymenurecordings.c b/mymenurecordings.c
index 0ad32e9..1a9f860 100644
--- a/mymenurecordings.c
+++ b/mymenurecordings.c
@@ -215,7 +215,7 @@ myMenuRecordings::myMenuRecordings(const char *Base,int Level):cOsdMenu(Base?Bas
  else
   if(myReplayControl::LastReplayed())
   {
-   if(mysetup.wasdvd)
+   if(mysetup.wasdvd&&!cControl::Control())
    {
     char *cmd;
     asprintf(&cmd,"dvdarchive.sh umount \"%s\"",myReplayControl::LastReplayed());
diff --git a/scripts/dvdarchive.sh b/scripts/dvdarchive.sh
index dfdee0a..3dc0c71 100755
--- a/scripts/dvdarchive.sh
+++ b/scripts/dvdarchive.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Version 1.1 2006-03-27
+# Version 1.2 2006-03-30
 #
 # Exitcodes:
 #
@@ -24,7 +24,7 @@ MOUNTPOINT="/media/cdrom" # no trailing '/'!
 
 #</Configuration>
 
-DEVICE="$(grep "$MOUNTPOINT" /etc/fstab | head -n1 | awk '{ print $1; }')" # dvd-device, used by isodetect if exists
+DEVICE="$(awk '( $1 !~ /^#/ ) && ( $2 == "'$MOUNTPOINT'" ) { print $1; exit; }' /etc/fstab)" # dvd-device, used by isodetect if exists
 
 REC="$2"
 NAME="$3"
-- 
cgit v1.2.3