Fixed RPAD icon display in main window

Author: Ryochan7

scc/gui/__init__.py

@@ -5,6 +5,6 @@
 	SCButtons.A, SCButtons.B, SCButtons.X, SCButtons.Y,
 	SCButtons.BACK, SCButtons.C, SCButtons.START,
 	SCButtons.LB, SCButtons.RB, SCButtons.LT, SCButtons.RT,
-	SCButtons.STICKPRESS, SCButtons.RPAD, SCButtons.LPAD,
+	SCButtons.STICKPRESS, SCButtons.LPAD, SCButtons.RPAD,
 	SCButtons.RGRIP, SCButtons.LGRIP
 )

scc/gui/daemon_manager.py

@@ -467,7 +467,9 @@ def get_button_name(config, button):
 				button = SCButtons.__members__[button]
 			index = BUTTON_ORDER.index(button)
 			name = ControllerManager.DEFAULT_ICONS[index]
-			name = config['gui']['buttons'][index]
+			btn_index = config['gui']['buttons'].index(name)
+			if btn_index != -1:
+				name = config['gui']['buttons'][btn_index]
 		except: pass
 		return name