From b80ba2f5a7bf7acbbbf14c1325fca8df3c39cac4 Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Sat, 14 Jan 2017 23:03:35 +0100
Subject: Fixed gamepad bug and overwrite bug

---
 settings.lua | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'settings.lua')

diff --git a/settings.lua b/settings.lua
index ad8b8e5..e73b997 100644
--- a/settings.lua
+++ b/settings.lua
@@ -11,6 +11,7 @@ function Settings.load()
 		end
 		local getSettings = love.filesystem.load("settings")
 		Settings.current = getSettings()
+		Controller.reset()
 		local joysticksList = love.joystick.getJoysticks() -- local list for editing
 		for _,set in pairs(Settings.current) do
 			local isJoystick = set[7]
@@ -57,7 +58,9 @@ function Settings.change(n, left, right, up, down, attack, jump, joystick)
 	else
 		bool = false
 	end
+	-- Save current settings
 	Settings.current[n] = {left, right, up, down, attack, jump, bool}
-	table.remove(Controller.sets, n)
-	Controller.registerSet(left, right, up, down, attack, jump, joystick)
+	Settings.save()
+	-- Load settings
+	Settings.load()
 end
\ No newline at end of file
-- 
cgit v1.1