diff options
| author | Greg Roach <greg@subaqua.co.uk> | 2026-02-11 19:04:47 +0000 |
|---|---|---|
| committer | Greg Roach <greg@subaqua.co.uk> | 2026-02-13 15:07:42 +0000 |
| commit | c327508fe2ba34443763ce55579e77f494b9eb3e (patch) | |
| tree | dce2167c1af3e5069f3b202599d7dd50b45b8a0f | |
| parent | a89e733b43783c6a0c2771cc8cecf309e02f65f3 (diff) | |
| download | webtrees-c327508fe2ba34443763ce55579e77f494b9eb3e.tar.gz webtrees-c327508fe2ba34443763ce55579e77f494b9eb3e.tar.bz2 webtrees-c327508fe2ba34443763ce55579e77f494b9eb3e.zip | |
Fix: deadlock-retry failure during GEDCOM import, caused by undefined progress
| -rw-r--r-- | app/Http/RequestHandlers/GedcomLoad.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/Http/RequestHandlers/GedcomLoad.php b/app/Http/RequestHandlers/GedcomLoad.php index 4a3e8e6002..83df859cc9 100644 --- a/app/Http/RequestHandlers/GedcomLoad.php +++ b/app/Http/RequestHandlers/GedcomLoad.php @@ -77,6 +77,9 @@ final class GedcomLoad implements RequestHandlerInterface ->where('gedcom_id', '=', $tree->id()) ->count(); + // Calculate progress so far + $progress = $import_offset / $import_total; + // Finished? if ($import_offset === $import_total) { if (!$tree->imported()) { @@ -129,9 +132,6 @@ final class GedcomLoad implements RequestHandlerInterface } } - // Calculate progress so far - $progress = $import_offset / $import_total; - $first_time = $import_offset === 0; // Collect up any errors, and show them later. |