Fix the error message when opening an invalid wg file.

davidgiven · Jan 22, 2025 · 6d810f9 · 6d810f9
1 parent b2bccff
commit 6d810f9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/lua/addons/templates.lua b/src/lua/addons/templates.lua
@@ -75,7 +75,7 @@ function Cmd.LoadDefaultTemplate()
 	local templatename = GlobalSettings.directories.templates.."/default.wg"
 	local r, e = wg.readfile(templatename)
 	if r then
-		local d, e = LoadFromString(r)
+		local d, e = LoadFromString(templatename, r)
 		if d then
 			local fileformat = d.fileformat or 1
 			if fileformat ~= FILEFORMAT then

diff --git a/src/lua/fileio.lua b/src/lua/fileio.lua
@@ -594,7 +594,7 @@ function LoadFromHeaderlessString(s)
 	return loadfromstreamt(CreateIStream(s))
 end
 
-function LoadFromString(data: string): (DocumentSet?, string?)
+function LoadFromString(filename: string, data: string): (DocumentSet?, string?)
 	local fp = CreateIStream(data)
 
 	local loader = nil
@@ -620,7 +620,7 @@ function LoadFromFile(filename): (DocumentSet?, string?)
 		return nil, ("'"..filename.."' could not be opened: "..e)
 	end
 	assert(data)
-	return LoadFromString(data)
+	return LoadFromString(filename, data)
 end
 
 local function loaddocument(filename): (DocumentSet?, string?)