Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
lewislarsen committed Jun 24, 2024
2 parents ee20ba4 + 39cae33 commit 505660b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ e7bc3b942e1391b53c97663eea56d8eb57119290
8260edeec8da22d26ed1f9a7ef120ed468e50184
c7cf3721a7a6c8cd138ef81b3b8808f3fcddbceb
1d5d93f483563014535776a7f2cf27942c4e3224
28dd8fbd2e4bc87417b57344f764902568e02a59
3 changes: 2 additions & 1 deletion app/Models/BackupTask.php
Original file line number Diff line number Diff line change
Expand Up @@ -194,12 +194,13 @@ public function eligibleToRunNow(): bool
if ($this->isReady() && $this->usingCustomCronExpression()) {
return $this->cronExpressionMatches();
}
if (!$this->isReady()) {
if (! $this->isReady()) {
return false;
}
if ($this->usingCustomCronExpression()) {
return false;
}

return $this->isTheRightTimeToRun();
}

Expand Down

0 comments on commit 505660b

Please sign in to comment.