Attempt fix for issue hollie#323.

pmatis · Nov 23, 2013 · ab84db9 · ab84db9
1 parent 2efdf23
commit ab84db9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/Insteon/BaseInsteon.pm b/lib/Insteon/BaseInsteon.pm
@@ -1978,7 +1978,7 @@ sub _get_engine_version_failure
 		$self->engine_version('I2CS');
 	}
 	#Clear success callback, otherwise it will run when message is cleared
-	$self->interface->active_message->success_callback('0');
+	$self->interface->active_message->success_callback('0') if defined $self->interface->active_message;
 }
 
 =item C<ping([count])>

diff --git a/lib/Insteon_PLM.pm b/lib/Insteon_PLM.pm
@@ -744,16 +744,16 @@ sub _parse_data {
                 { #ALL-Linking Completed
 			my $link_address = substr($message_data,4,6);
 			&::print_log("[Insteon_PLM] DEBUG2: ALL-Linking Completed with $link_address ($message_data)") if $main::Debug{insteon} >= 2;
-			if ($self->active_message->success_callback){
+			if ($self->active_message){
 				main::print_log("[Insteon::Insteon_PLM] DEBUG4: Now calling message success callback: "
 					. $self->active_message->success_callback) if $main::Debug{insteon} >= 4;
 				package main;
 					eval $self->active_message->success_callback;
 					::print_log("[Insteon::Insteon_PLM] problem w/ success callback: $@") if $@;
 				package Insteon::BaseObject;
+				#Clear awaiting_ack flag
+				$self->active_message->setby->_process_command_stack(0);
 			}
-			#Clear awaiting_ack flag
-			$self->active_message->setby->_process_command_stack(0);
                         $self->clear_active_message();
 		}
                 elsif ($parsed_prefix eq $prefix{all_link_clean_failed} and ($message_length == 12))