From 12f06ad9d6779f844ee21ef0a7e42edda82805c4 Mon Sep 17 00:00:00 2001 From: Byte09 Date: Mon, 27 Aug 2018 18:18:19 +0000 Subject: [PATCH] 98_MSwitch.pm:fix fhem_restart_bug git-svn-id: https://svn.fhem.de/fhem/trunk@17217 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/98_MSwitch.pm | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/fhem/FHEM/98_MSwitch.pm b/fhem/FHEM/98_MSwitch.pm index a25108e5e..e6184467d 100644 --- a/fhem/FHEM/98_MSwitch.pm +++ b/fhem/FHEM/98_MSwitch.pm @@ -1588,7 +1588,6 @@ sub MSwitch_Attr(@) { { delete( $hash->{helper}{savemodeblock} ); delete( $hash->{READINGS}{Safemode} ); - MSwitch_LoadHelper($hash); MSwitch_Createtimer($hash); } @@ -1597,18 +1596,12 @@ sub MSwitch_Attr(@) { { $hash->{NOTIFYDEV} = ReadingsVal( $name, 'Trigger_device', 'no_trigger' ); - - MSwitch_Delete_Delay($hash,'all'); - MSwitch_Clear_timer($hash); } if ($cmd eq 'del'&& $aName eq 'disable'&& ReadingsVal($name, 'Trigger_device', 'no_trigger') ne 'no_trigger' ) { $hash->{NOTIFYDEV} = ReadingsVal( $name, 'Trigger_device', 'no_trigger' ); - - MSwitch_Delete_Delay($hash,'all'); - MSwitch_Clear_timer($hash); } if ($aName eq 'MSwitch_Activate_MSwitchcmds' && $aVal == 1 ) @@ -5772,7 +5765,7 @@ sub MSwitch_VUpdate($) { # my $newtriggercond = join( '|', @devs ); # readingsSingleUpdate( $hash, ".Device_Affected_Details", $newtriggercond, 0 ); - Log3( $Name, 5,"vupdate - $Name". __LINE__ ); + Log3( $Name, 0,"vupdate - $Name". __LINE__ ); #$attr{$Name}{disable} = '0'; readingsSingleUpdate( $hash, ".V_Check", $vupdate, 0 ); @@ -6340,8 +6333,10 @@ $todec =~ s/#\[wa\]/|/g; return $todec; } + 1; + =pod =item helper =item summary MultiswitchModul @@ -6502,4 +6497,3 @@ MSwitch is an auxiliary module that works both event- and time-controlled.