Added error catching for user-side scripts so it can't bring down the entire control menu

Author: Quaggles

DCS-Keybind-Injector-Quaggles/DCS-Keybind-Injector-Quaggles/Scripts/Input/Data.lua

@@ -102,18 +102,23 @@ local function QuagglesKeybindInjector(filename, folder, env, result)
 		if lfs.attributes(newFileName) then
 			if quagglesLoggingEnabled then log.write(quagglesLogName, log.INFO, '----Found merge at: '..newFileName) end
 			--Configure file to run in same environment as the default command entry file
-			local f = loadfile(newFileName)
-			setfenv(f, env)
-			local statusInj, resultInj
-			statusInj, resultInj = pcall(f)
-
-			-- Merge resulting tables
-			if statusInj then
-				if resultInj.keyCommands then env.join(result.keyCommands, resultInj.keyCommands) end
-				if resultInj.axisCommands then env.join(result.axisCommands, resultInj.axisCommands) end
-				if quagglesLoggingEnabled then log.write(quagglesLogName, log.INFO, '------Merge successful') end
+			local f, err = loadfile(newFileName)
+			if err ~= nil then
+				log.write(quagglesLogName, log.ERROR, '------Failure loading: '..tostring(newFileName).." Error: "..tostring(err))
+				return
 			else
-				if quagglesLoggingEnabled then log.write(quagglesLogName, log.INFO, '------Merge failed: '..tostring(statusInj)) end
+				setfenv(f, env)
+				local statusInj, resultInj
+				statusInj, resultInj = pcall(f)
+
+				-- Merge resulting tables
+				if statusInj then
+					if resultInj.keyCommands then env.join(result.keyCommands, resultInj.keyCommands) end
+					if resultInj.axisCommands then env.join(result.axisCommands, resultInj.axisCommands) end
+					if quagglesLoggingEnabled then log.write(quagglesLogName, log.INFO, '------Merge successful') end
+				else
+					if quagglesLoggingEnabled then log.write(quagglesLogName, log.INFO, '------Merge failed: '..tostring(statusInj)) end
+				end
 			end
 		end
 	end