Added an extra check for null for button states

knowthelist · Mar 17, 2015 · 859cf49 · 859cf49
1 parent 75e575c
commit 859cf49
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/js/fhem-tablet-ui.js b/js/fhem-tablet-ui.js
@@ -369,15 +369,16 @@ function update(filter) {
 	 	else if (deviceType == 'switch' || deviceType == 'contact'){
 
 			var state = getDeviceValue( $(this), 'get' );
-
-			if ( state == $(this).data('get-on') )
-				$(this).data('famultibutton').setOn();
-			else if ( state == $(this).data('get-off') )
-				$(this).data('famultibutton').setOff();
-	 		else if ( state.match(RegExp('^' + $(this).data('get-on') + '$')) )
-			    	$(this).data('famultibutton').setOn();
-			else if ( state.match(RegExp('^' + $(this).data('get-off') + '$')) )
-			    	$(this).data('famultibutton').setOff();
+			if (state) {
+				if ( state == $(this).data('get-on') )
+					$(this).data('famultibutton').setOn();
+				else if ( state == $(this).data('get-off') )
+					$(this).data('famultibutton').setOff();
+				else if ( state.match(RegExp('^' + $(this).data('get-on') + '$')) )
+						$(this).data('famultibutton').setOn();
+				else if ( state.match(RegExp('^' + $(this).data('get-off') + '$')) )
+						$(this).data('famultibutton').setOff();
+			}
 		}
  	});
  	ready = true;