ACC: Quickfix for setting lap driver when driver index is not found

mauserrifle · Apr 30, 2024 · 94859bf · 94859bf
1 parent cbc72c6
commit 94859bf
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/lib/Simresults/Data/Reader/AssettoCorsaCompetizione.php b/lib/Simresults/Data/Reader/AssettoCorsaCompetizione.php
@@ -494,7 +494,7 @@ protected function readSessions()
             }
 
             // Set driver based on driver index (swapping support)
-            $lap->setDriver($lap_participant->getDriver($driverIndex+1));
+            $lap->setDriver($lap_participant->getDriver($driverIndex+1) ?:$lap_participant->getDriver(0));
 
             // Is valid for best?
             $valid_for_best = $this->helper->arrayGet($lap_data, 'isValidForBest');
@@ -604,9 +604,11 @@ protected function readSessions()
                 $driverIndex = $penalty_data['driverId'];;
             }
 
+            $penalty_driver = $penalty_participant->getDriver($driverIndex+1) ?: $penalty_participant->getDriver(0);
+
             // Set message
             $penalty->setMessage(
-                $penalty_participant->getDriver($driverIndex+1)->getName().
+                $penalty_driver->getName().
 
                 ' - '.
                 $this->helper->arrayGet($penalty_data, 'reason', 'Unknown reason').