- my ($ibx, $inot) = @_;
- my $path = "$ibx->{inboxdir}/";
- $path .= $ibx->version >= 2 ? 'inbox.lock' : 'ssoma.lock';
- $inot->watch($path, $IN_CLOSE, sub { $ibx->on_unlock });
+ my ($ibx, $self) = @_;
+ my $dir = abs_path($ibx->{inboxdir});
+ if (!defined($dir)) {
+ warn "W: $ibx->{inboxdir} not watched: $!\n";
+ return;
+ }
+ my $inot = $self->{inot};
+ my $cur = $self->{pathmap}->{$dir} //= [];
+
+ # transfer old subscriptions to the current inbox, cancel the old watch
+ if (my $old_ibx = $cur->[0]) {
+ $ibx->{unlock_subs} and
+ die "BUG: $dir->{unlock_subs} should not exist";
+ $ibx->{unlock_subs} = $old_ibx->{unlock_subs};
+ $cur->[1]->cancel;
+ }
+ $cur->[0] = $ibx;
+
+ my $lock = "$dir/".($ibx->version >= 2 ? 'inbox.lock' : 'ssoma.lock');
+ $cur->[1] = $inot->watch($lock, $IN_MODIFY, sub { $ibx->on_unlock });
+