From c3a037f7b66842c516b7a223976bb05f91946379 Mon Sep 17 00:00:00 2001 From: Milan Nikolic Date: Fri, 19 May 2017 18:04:23 +0200 Subject: [PATCH] Fix joy name --- src/m64py/frontend/input.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/m64py/frontend/input.py b/src/m64py/frontend/input.py index 4b01f9c..5760b17 100644 --- a/src/m64py/frontend/input.py +++ b/src/m64py/frontend/input.py @@ -123,8 +123,8 @@ class Input(QDialog, Ui_InputDialog): devices = [(self.tr("Keyboard/Mouse"), -1)] self.device_map[-1] = "Keyboard" for num, joy in enumerate(self.joystick.joystick_names): - devices.append((self.tr("Joystick %s (%s)" % (num, joy.decode())), num)) - self.device_map[num] = joy.decode() + devices.append((self.tr("Joystick %s (%s)" % (num, joy.encode().decode())), num)) + self.device_map[num] = joy.encode().decode() for device, dtype in devices: self.comboDevice.addItem(device, dtype)