From db95e8918129afe28fc5e73697f98d6f464a2a3e Mon Sep 17 00:00:00 2001
From: jpawlowski <jpawlowski@users.noreply.github.com>
Date: Mon, 19 Jan 2015 00:21:21 +0000
Subject: [PATCH] RESIDENTS: only load default attributes once after user
 define

git-svn-id: https://svn.fhem.de/fhem/trunk@7624 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/10_RESIDENTS.pm | 42 ++++++++-------------------------------
 1 file changed, 8 insertions(+), 34 deletions(-)

diff --git a/fhem/FHEM/10_RESIDENTS.pm b/fhem/FHEM/10_RESIDENTS.pm
index fbf745080..1d8d25569 100755
--- a/fhem/FHEM/10_RESIDENTS.pm
+++ b/fhem/FHEM/10_RESIDENTS.pm
@@ -71,41 +71,15 @@ sub RESIDENTS_Define($$) {
 
     $hash->{TYPE} = "RESIDENTS";
 
-    # attr alias
-    $name_attr = "alias";
-    unless ( exists( $attr{$name}{$name_attr} ) ) {
-        $attr{$name}{$name_attr} = "Residents";
-    }
-
-    # attr devStateIcon
-    $name_attr = "devStateIcon";
-    unless ( exists( $attr{$name}{$name_attr} ) ) {
-        $attr{$name}{$name_attr} =
+    # set default settings on first define
+    if ($init_done) {
+        $attr{$name}{alias}         = "Residents";
+        $attr{$name}{devStateIcon}  =
 '.*home:status_available:absent .*absent:status_away_1:home .*gone:status_standby:home .*none:control_building_empty .*gotosleep:status_night:asleep .*asleep:status_night:awoken .*awoken:status_available:home';
-    }
-
-    # attr group
-    $name_attr = "group";
-    unless ( exists( $attr{$name}{$name_attr} ) ) {
-        $attr{$name}{$name_attr} = "Home State";
-    }
-
-    # attr icon
-    $name_attr = "icon";
-    unless ( exists( $attr{$name}{$name_attr} ) ) {
-        $attr{$name}{$name_attr} = "control_building_filled";
-    }
-
-    # attr room
-    $name_attr = "room";
-    unless ( exists( $attr{$name}{$name_attr} ) ) {
-        $attr{$name}{$name_attr} = "Residents";
-    }
-
-    # attr webCmd
-    $name_attr = "webCmd";
-    unless ( exists( $attr{$name}{$name_attr} ) ) {
-        $attr{$name}{$name_attr} = "state";
+        $attr{$name}{group}         = "Home State";
+        $attr{$name}{icon}          = "control_building_filled";
+        $attr{$name}{room}          = "Residents";
+        $attr{$name}{webCmd}        = "state";
     }
 
     return undef;