Fixes nil error #3493

Courseplay · Oct 4, 2024 · 0b7841b · 0b7841b
1 parent d3d723b
commit 0b7841b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/scripts/Course.lua b/scripts/Course.lua
@@ -1572,8 +1572,8 @@ function Course:saveToXml(courseXml, courseKey)
     end
 end
 
----@param vehicle  table
----@param courseXml XmlFile
+---@param vehicle  table|nil
+---@param courseXml table
 ---@param courseKey string key to the course in the XML
 function Course.createFromXml(vehicle, courseXml, courseKey)
     local course = Course(vehicle, {})
@@ -1602,7 +1602,9 @@ function Course.createFromXml(vehicle, courseXml, courseKey)
     if course.nVehicles and course.nVehicles > 1 then
         course.multiVehicleData = Course.MultiVehicleData.createFromXmlFile(courseXml, courseKey)
         course:setPosition(course.multiVehicleData:getPosition())
-        vehicle:getCpLaneOffsetSetting():setValue(course.multiVehicleData:getPosition())
+        if vehicle then
+            vehicle:getCpLaneOffsetSetting():setValue(course.multiVehicleData:getPosition())
+        end
     else
         course:enrichWaypointData()
     end

diff --git a/scripts/editor/CourseEditor.lua b/scripts/editor/CourseEditor.lua
@@ -30,7 +30,7 @@ function CourseEditor:loadCourse()
 	local function load(self, xmlFile, baseKey, noEventSend, name)
 		xmlFile:iterate(baseKey, function (i, key)
 			CpUtil.debugVehicle(CpDebug.DBG_COURSES, self, "Loading assigned course: %s", key)
-			local course = Course.createFromXml(self, xmlFile, key)
+			local course = Course.createFromXml(nil, xmlFile, key)
 			course:setName(name)
 			self.courseWrapper = EditorCourseWrapper(course)
 		end)