From 6d810f9329a31be6090db1261b8cae433c0cce81 Mon Sep 17 00:00:00 2001
From: David Given <dg@cowlark.com>
Date: Wed, 22 Jan 2025 14:32:56 +0100
Subject: [PATCH] Fix the error message when opening an invalid wg file.

---
 src/lua/addons/templates.lua | 2 +-
 src/lua/fileio.lua           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lua/addons/templates.lua b/src/lua/addons/templates.lua
index dcca656d..b6db83b1 100644
--- 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
index bb78509b..4278eff7 100644
--- 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?)