From 8f50162924e1886d68902f48b64b1a04b1af56d0 Mon Sep 17 00:00:00 2001
From: Lynix <lynix680@gmail.com>
Date: Sun, 31 Jul 2016 11:01:07 +0200
Subject: [PATCH] Build: Fix command line arguments being ignored if config.lua
 loading failed

Former-commit-id: a21dc17f960e089dc3f8a2330def494660c682a9 [formerly b776370d7fc80107c412fe91526de7d11d53d501]
Former-commit-id: b5df17fcceeba1996b06c7fa92abf8616a2a8006
---
 build/scripts/common.lua | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/build/scripts/common.lua b/build/scripts/common.lua
index 66345ef7e..fa610e85c 100644
--- a/build/scripts/common.lua
+++ b/build/scripts/common.lua
@@ -637,28 +637,25 @@ end
 
 function NazaraBuild:LoadConfig()
     local f = io.open("config.lua", "r")
-	if (not f) then
+	if (f) then
+	    local content = f:read("*a")
+		f:close()
+
+		local func, err = loadstring(content)
+		if (func) then
+			setfenv(func, self.Config)
+
+			local status, err = pcall(func)
+			if (not status) then
+				print("Failed to load config.lua: " .. err)
+			end
+		else
+			print("Failed to parse config.lua: " .. err)
+		end
+	else
 		print("Failed to open config.lua")
-		return
 	end
 
-    local content = f:read("*a")
-    f:close()
-
-	local func, err = loadstring(content)
-	if (not func) then
-		print("Failed to parse config.lua: " .. err)
-		return
-	end
-
-	setfenv(func, self.Config)
-	
-	local status, err = pcall(func)
-	if (not status) then
-		print("Failed to load config.lua: " .. err)
-		return
-	end
-	
 	local configTable = self.Config
 	local AddBoolOption = function (option, name, description)
 		newoption({