Skip to content

Commit 367b0ff

Browse files
committed
fix: fix UserHomeSetupListener disabling with nested events
Signed-off-by: Robin Appelman <robin@icewind.nl>
1 parent 922264f commit 367b0ff

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

apps/files_sharing/lib/Listener/SharesUpdatedListener.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public function __construct(
6161

6262
public function handle(Event $event): void {
6363
// don't trigger the on-setup checks if this handler triggers an fs setup
64-
$this->homeSetupListener->setDisabled(true);
64+
$oldState = $this->homeSetupListener->setDisabled(true);
6565

6666
if ($event instanceof UserShareAccessUpdatedEvent) {
6767
foreach ($event->getUsers() as $user) {
@@ -111,7 +111,7 @@ public function handle(Event $event): void {
111111
}
112112
}
113113

114-
$this->homeSetupListener->setDisabled(false);
114+
$this->homeSetupListener->setDisabled($oldState);
115115
}
116116

117117
private function markOrRun(IUser $user, callable $callback): void {

apps/files_sharing/lib/Listener/UserHomeSetupListener.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,10 @@ public function __construct(
3030
) {
3131
}
3232

33-
public function setDisabled(bool $disabled): void {
33+
public function setDisabled(bool $disabled): bool {
34+
$previous = $this->disabled;
3435
$this->disabled = $disabled;
36+
return $previous;
3537
}
3638
public function handle(Event $event): void {
3739
if (!$event instanceof UserHomeSetupEvent) {

0 commit comments

Comments
 (0)