From 73eb3791c2ddbe1aa356dfc5d2f48221bdd7ef12 Mon Sep 17 00:00:00 2001
From: rudolfkoenig <rudolfkoenig@2b470e98-0d58-463d-a4d8-8e2adae1ed80>
Date: Sat, 14 Apr 2012 13:49:37 +0000
Subject: [PATCH] Read in fhem.state even if fhem.cfg contains errors

git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@1451 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/fhem.pl | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/fhem/fhem.pl b/fhem/fhem.pl
index a00930775..23aac685c 100755
--- a/fhem/fhem.pl
+++ b/fhem/fhem.pl
@@ -968,8 +968,9 @@ CommandRereadCfg($$)
   doGlobalDef($cfgfile);
 
   my $ret = CommandInclude($cl, $cfgfile);
-  if(!$ret && $attr{global}{statefile} && -r $attr{global}{statefile}) {
-    $ret = CommandInclude($cl, $attr{global}{statefile});
+  if($attr{global}{statefile} && -r $attr{global}{statefile}) {
+    my $ret2 = CommandInclude($cl, $attr{global}{statefile});
+    $ret = (defined($ret) ? "$ret\n$ret2" : $ret2) if(defined($ret2));
   }
   DoTrigger("global", "REREADCFG");