Merge branch 'master' into testing

scripts/te-set-time.js

@@ -194,11 +194,23 @@ function setOneEvent(oEvent)
             }
         }    
         lInfo.logln('queueTimedEvents - recurrence rule is ' + sRRule);
+
+    	resetOneEvent('dynamic/countdownTimer/' + oEvent.getChild('id').getValue());
+        resetOneEvent('dynamic/scheduledFixedEvents/' + oEvent.getChild('id').getValue());
+        resetOneEvent('dynamic/scheduledDynamicEvents/' + oEvent.getChild('id').getValue());
+        if (Property.getNode('dynamic/scheduledMultipleEvents/' + oEvent.getChild('id'))!=null {
+	        var oMultipleNode=Property.getNode('dynamic/scheduledMultipleEvents/' + oEvent.getChild('id').getValue());
+	        if (oMultipleNode!=null) {
+	            var subNodes=oMultipleNode.getChildren();
+	            if (subNodes!=null)
+	                for (var jIndex=0;jIndex<subNodes.length;jIndex++)
+	                    resetOneEvent('dynamic/scheduledMultipleEvents/' + oEvent.getChild('id').getValue() + '/' + subNodes[jIndex].name);
+	        }
+        }
+        
         
         if (oEvent.getChild('time/timeBase').getValue() == 'daily')  // nur statische Events hier 
         {           
-        	resetOneEvent('dynamic/countdownTimer/' + oEvent.getChild('id').getValue());
-            resetOneEvent('dynamic/scheduledFixedEvents/' + oEvent.getChild('id').getValue());
             lInfo.logln('queueTimedEvents - it has a fixed time');
     
             var timeValue = Math.abs(oEvent.getChild('time/offset').getValue());
@@ -248,18 +260,6 @@ function setOneEvent(oEvent)
             		queueDeleteCounter(oEvent,iTempStartTime,sRRule);
             
         } else {
-        	resetOneEvent('dynamic/countdownTimer/' + oEvent.getChild('id').getValue());
-            if (fMultiple) {
-                var oMultipleNode=Property.getNode('dynamic/scheduledMultipleEvents/' + oEvent.getChild('id').getValue());
-                if (oMultipleNode!=null) {
-                    var subNodes=oMultipleNode.getChildren();
-                    if (subNodes!=null)
-                        for (var jIndex=0;jIndex<subNodes.length;jIndex++)
-                            resetOneEvent('dynamic/scheduledMultipleEvents/' + oEvent.getChild('id').getValue() + '/' + subNodes[jIndex].name);
-                }
-            }
-            else            
-                resetOneEvent('dynamic/scheduledDynamicEvents/' + oEvent.getChild('id').getValue());
             lInfo.logln('queueTimedEvents - it has a '+oEvent.getChild('time/timeBase').getValue()+' time');
     
             var timeValue = oEvent.getChild('time/offset').getValue();
@@ -368,7 +368,7 @@ function setOneEvent(oEvent)
 
     } 
     catch (e) {
-        lWarn.logln("FEHLER beim setzen des Timers fr " + oEvent.name + " : " + e);
+        lWarn.logln("FEHLER beim setzen des Timers f�r " + oEvent.name + " : " + e);
     }
 }
 
@@ -413,7 +413,7 @@ function queueAllTimedEvents() {
                 setOneEvent(oEvent);
             } 
             catch (e) {
-                lWarn.logln("FEHLER beim setzen des Timers fr " + oEvent.iIndex + " : " + e);
+                lWarn.logln("FEHLER beim setzen des Timers f�r " + oEvent.iIndex + " : " + e);
             }
         }
     }