deduplicate

Author: Nightblade

src/Modules/Build.lua

@@ -1821,8 +1821,7 @@ function buildMode:LoadDB(xmlText, fileName)
 	-- Parse the XML
 	local dbXML, errMsg = common.xml.ParseXML(xmlText)
 	if errMsg and errMsg:match(".*file returns nil") then
-		ConPrintf("Error: '%s'", errMsg)
-		main:OpenMessagePopup("Cannot read file", '\nMake sure OneDrive is running then restart PoB and try again.\n\n"'..errMsg..'"')
+		main:OpenOneDriveErrPopup(fileName)
 		return true
 	elseif errMsg then
 		ConPrintf("Error: '%s'", errMsg)

src/Modules/BuildList.lua

@@ -217,7 +217,7 @@ function listMode:BuildList()
 			local fileText = fileHnd:read("*a")
 			fileHnd:close()
 			if not fileText then
-				main:OpenMessagePopup("Cannot read file", '\nMake sure OneDrive is running then restart PoB and try again.\n\n"'..build.fullFileName..'"')
+				main:OpenOneDriveErrPopup(build.fullFileName)
 				return
 			end
 			fileText = fileText:match("(<Build.->)")

src/Modules/Main.lua

@@ -519,9 +519,7 @@ end
 function main:LoadSettings(ignoreBuild)
 	local setXML, errMsg = common.xml.LoadXMLFile(self.userPath.."Settings.xml")
 	if errMsg and errMsg:match(".*file returns nil") then
-		ConPrintf("Error: '%s'", errMsg)
-		main:OpenMessagePopup("Cannot read file", '\nMake sure OneDrive is running then restart PoB and try again.\n\n"'..errMsg..'"')
-		self.saveSettingsOnExit = false
+		self:OpenOneDriveErrPopup(self.userPath.."Settings.xml")
 		return true
 	elseif errMsg and not errMsg:match(".*No such file or directory") then
 		ConPrintf("Error: '%s'", errMsg)
@@ -665,9 +663,7 @@ end
 function main:LoadSharedItems()
 	local setXML, errMsg = common.xml.LoadXMLFile(self.userPath.."Settings.xml")
 	if errMsg and errMsg:match(".*file returns nil") then
-		ConPrintf("Error: '%s'", errMsg)
-		main:OpenMessagePopup("Cannot read file", '\nMake sure OneDrive is running then restart PoB and try again.\n\n"'..errMsg..'"')
-		self.saveSettingsOnExit = false
+		self:OpenOneDriveErrPopup(self.userPath.."Settings.xml")
 		return true
 	elseif errMsg and not errMsg:match(".*No such file or directory") then
 		ConPrintf("Error: '%s'", errMsg)
@@ -1569,6 +1565,18 @@ function main:OpenNewFolderPopup(path, onClose)
 	main:OpenPopup(370, 100, "New Folder", controls, "create", "edit", "cancel")
 end
 
+---Shows a OneDrive-specific error popup
+function main:OpenOneDriveErrPopup(fileName)
+	if fileName and fileName ~= "" then
+		fileName = "'"..fileName.."'"
+	else
+		fileName = ""
+	end
+	ConPrintf("Error: OneDrive: file unreadable: %s", fileName)
+	self:OpenMessagePopup(" Cannot read file ", "\nMake sure OneDrive is running then restart "..APP_NAME.." and try again.\n\n"..fileName)
+	self.saveSettingsOnExit = false
+end
+
 function main:SetWindowTitleSubtext(subtext)
 	if not subtext or not self.showTitlebarName then
 		SetWindowTitle(APP_NAME)