some bug fixes

6 files changed, 23 insertions, 21 deletions

diff --git a/README b/README
index 241fe06..6166815 100644
--- a/README
+++ b/README
@@ -1,10 +1,10 @@
 This is a "plugin" for the Video Disk Recorder (VDR).
 
-Written by:                  Your Name <email@host.dom>
+Written by:                  Dirk Heiser <email@host.dom>
 
-Project's homepage:          URL
+Project's homepage:          http://projects.vdr-developer.org/projects/plg-uactivity
 
-Latest version available at: URL
+Latest version available at: http://projects.vdr-developer.org/projects/plg-uactivity/files
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/po/de_DE.po b/po/de_DE.po
index 19d863b..49d227b 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -15,4 +15,4 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 msgid "running shellscipts based upton user aktivity changes"
-msgstr ""
+msgstr "Startet Shellscripte bei Änderungen der Nutzeraktivität"
diff --git a/script/uactivity/activity/-10-syslog_demo b/script/uactivity/activity/-10-syslog_demo
index 2ea25ee..8c16823 100644
--- a/script/uactivity/activity/-10-syslog_demo
+++ b/script/uactivity/activity/-10-syslog_demo
@@ -5,7 +5,7 @@ case "${1}" in
     logger -t "uactivity [activity/$(basename ${0})]" "activity starting up"
     [ "${2}" = "true" ] \
       && logger -t "uactivity [activity/$(basename ${0})]" "status \"user active\"" \
-      || logger -t "uactivity [activity/$(basename ${0})]" "status \"user inactive\"
+      || logger -t "uactivity [activity/$(basename ${0})]" "status \"user inactive\""
     logger -t "uactivity [activity/$(basename ${0})]" "ConfigDirectory:   ${3}"
     logger -t "uactivity [activity/$(basename ${0})]" "CacheDirectory:    ${4}"
     logger -t "uactivity [activity/$(basename ${0})]" "ResourceDirectory: ${5}"
@@ -14,7 +14,7 @@ case "${1}" in
     logger -t "uactivity [activity/$(basename ${0})]" "activity shutting down"
     [ "${2}" = "true" ] \
       && logger -t "uactivity [activity/$(basename ${0})]" "status \"user active\"" \
-      || logger -t "uactivity [activity/$(basename ${0})]" "status \"user inactive\"
+      || logger -t "uactivity [activity/$(basename ${0})]" "status \"user inactive\""
     logger -t "uactivity [activity/$(basename ${0})]" "ConfigDirectory:   ${3}"
     logger -t "uactivity [activity/$(basename ${0})]" "CacheDirectory:    ${4}"
     logger -t "uactivity [activity/$(basename ${0})]" "ResourceDirectory: ${5}"
diff --git a/script/uactivity/activity/-20-switch_tv b/script/uactivity/activity/-20-switch_tv
index 0322c67..f014e6f 100644
--- a/script/uactivity/activity/-20-switch_tv
+++ b/script/uactivity/activity/-20-switch_tv
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-[ "${2}" = "true" ] \
+([ "${2}" = "true" ] && [ "${1}" != "shutdown" ]) \
   && irsend -d /var/run/lirc/ya_usbir SEND_ONCE TP av \
   || irsend -d /var/run/lirc/ya_usbir SEND_ONCE TP off
 
diff --git a/script/uactivity/key/-20-toggle_demo b/script/uactivity/key/-20-toggle_demo
index e5e1a1e..a3752fd 100644
--- a/script/uactivity/key/-20-toggle_demo
+++ b/script/uactivity/key/-20-toggle_demo
@@ -1,25 +1,27 @@
 #!/bin/sh
 
-# we are interested in Key "1"
-[ "${2}" != "1" ] && exit 0
+FLAG="${4}/key/flag.$(basename ${0})"
 
 case "${1}" in
   startup)
     # create flag directory (using cache directory)
-    mkdir -p ${4}/key/
+    mkdir -p "${4}/key/"
     # delete flag
-    rm -f ${4}/key/$(basename ${0}).flag
+    rm -f "${FLAG}"
   ;;
   running)
-    if [ -f "${4}/key/flag.$(basename ${0})" ]; then
-      # here we do our "off" action
-      logger -t "uactivity [key/$(basename ${0})]" "$(basename ${0}) off"
-      rm -f "${4}/key/flag.$(basename ${0})"
-    else
-      # here we do our "on" action
-      logger -t "uactivity [key/$(basename ${0})]" "$(basename ${0}) on"
-      # do not use names starting with [0-9][0-9] for data files
-      touch "${4}/key/flag.$(basename ${0})"
+    # we are interested in Key "1"
+    if [ "${2}" = "1" ]; then
+      if [ -f "${FLAG}" ]; then
+        # here we do our "off" action
+        logger -t "uactivity [key/$(basename ${0})]" "$(basename ${0}) off"
+        rm -f "${FLAG}"
+      else
+        # here we do our "on" action
+        logger -t "uactivity [key/$(basename ${0})]" "$(basename ${0}) on"
+        # do not use names starting with [0-9][0-9] for data files
+        touch "${FLAG}"
+      fi
     fi
   ;;
 esac
diff --git a/uactivity.c b/uactivity.c
index ed6ab97..bc36266 100644
--- a/uactivity.c
+++ b/uactivity.c
@@ -132,7 +132,7 @@ void cPluginUactivity::Stop(void)
 {
   // Stop any background activities the plugin is performing.
   Run.Call(oShutDown, k_Setup);
-  Run.Call(oShutDown, false);
+  Run.Call(oShutDown, !ShutdownHandler.IsUserInactive());
   Run.Call(oShutDown);
 }