Fixed error calling method on undefined $self->setby in Message.pm.

Fixed error calling undefined method 'level' on RemoteLinc object in BaseInsteon.pm.
dracoventions · Apr 9, 2013 · 6b8fa95 · krkeegan · Apr 12, 2013 · krkeegan
1 parent 07453ad
commit 6b8fa95
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
@@ -455,7 +455,13 @@ sub _is_info_request
 		&::print_log("[Insteon::BaseObject] received status for " .
 			$self->{object_name} . " with on-level: $ack_on_level%, "
 			. "hops left: $msg{hopsleft}") if $main::Debug{insteon};
-		$self->level($ack_on_level); # update the level value
+
+		# A RemoteLinc may send Insteon Message: 18b3, meaning "Light Stop Manual Change" aka 
+		# "Stop changing On-Level".  But since RemoteLinc doesn't have a level() method defined,
+		# we will cause a crash here if we don't check if $self->can('level').
+		if($self->can('level')) {
+		        $self->level($ack_on_level); # update the level value
+		}
 		if ($ack_on_level == 0) {
 			$self->SUPER::set('off', $ack_setby);
 		} elsif ($ack_on_level > 0 and !($self->isa('Insteon::DimmableLight'))) {

diff --git a/lib/Insteon/Message.pm b/lib/Insteon/Message.pm
@@ -137,9 +137,11 @@ sub send
                                 }
                         }
                         elsif (defined($$self{no_hop_increase}) && $main::Debug{insteon}){
-                        	&main::print_log("[Insteon::BaseMessage] Hop count not increased for "
-                        		. $self->setby->get_object_name . " because no_hop_increase flag was set.");
-                        	$$self{no_hop_increase} = undef;
+                                if(defined($self->setby)) {
+                                	&main::print_log("[Insteon::BaseMessage] Hop count not increased for "
+                                		. $self->setby->get_object_name . " because no_hop_increase flag was set.");
+                                	$$self{no_hop_increase} = undef;
+                                }
                         }
                 }