From 941d0214a4a1b499190f4f3c6133b5e512d897fe Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Mon, 10 Oct 2016 22:42:58 +0200
Subject: Add joystick controllers only if js present

---
 settings.lua | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'settings.lua')

diff --git a/settings.lua b/settings.lua
index 920abdf..93432a0 100644
--- a/settings.lua
+++ b/settings.lua
@@ -12,10 +12,14 @@ function Settings.load()
 		local getSettings = love.filesystem.load("settings")
 		for _,set in pairs(getSettings()) do
 			local isJoystick = set[7]
+			local joystick
 			if isJoystick then
+				joystick = love.joystick.getJoysticks()[1]
 				-- Add first free joystick from joysticks list
 			end
-			Controller.registerSet(set[1], set[2], set[3], set[4], set[5], set[6], joystick)
+			if not isJoystick or joystick then
+				Controller.registerSet(set[1], set[2], set[3], set[4], set[5], set[6], joystick)
+			end
 		end
 	end
 end
-- 
cgit v1.1