Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for Issue #27 #30

Closed
wants to merge 4 commits into from
Closed

Fix for Issue #27 #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7178bab
Merge branch 'insteon_local_update_fix'
krkeegan Dec 15, 2012
ed0037d
Merge in upstream
krkeegan Dec 15, 2012
253afad
Fix for Issue #26
krkeegan Dec 20, 2012
2e25477
Fix for Issue #27
krkeegan Dec 20, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions lib/Insteon/BaseInterface.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,20 @@ sub on_standard_insteon_received
$self->transmit_in_progress(1);
# ask the object to process the received message and update its state
$object->_process_message($self, %cleanup_msg);
$self->clear_active_message();
# Only clear active message if the cleanup received is really meant for the active message
if (($msg{extra} == $self->active_message->setby->group)
&& ($object->message_type($msg{cmd_code}) eq $self->active_message->command)){
$self->clear_active_message();
&main::print_log("[Insteon::BaseInterface] DEBUG3: Cleanup message received, "
. "matched active message, cleared the active message") if $main::Debug{insteon} >= 3;
}
else {
&main::print_log("[Insteon::BaseInterface] DEBUG3: Cleanup message received, but "
. "active message not cleared b/c group/command in recent message "
. $msg{extra}."/".$object->message_type($msg{cmd_code}). " did not match group in "
. "prior sent message group/command " . $self->active_message->setby->group
."/".$self->active_message->command) if $main::Debug{insteon} >= 3;
}
}
else
{
Expand Down Expand Up @@ -512,4 +525,4 @@ sub _aldb
}


1
1
7 changes: 6 additions & 1 deletion web/bin/tagline.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@

# Authority: anyone

@ARGV = "$config_parms{data_dir}/remarks/1100tags.txt";
if (-e "$config_parms{data_dir}/remarks/1100tags.txt"){
@ARGV = "$config_parms{data_dir}/remarks/1100tags.txt";
}
else{
@ARGV = "$Pgm_Root/data/remarks/1100tags.txt";
}

my $tagline;
rand($.) < 1 && ($tagline=$_) while <>;
Expand Down