Emulation/mupen64plus-ui-python
1
0
Fork 0
mirror of https://github.com/mupen64plus/mupen64plus-ui-python.git synced 2025-04-02 10:51:53 -04:00
Code Issues Projects Releases Packages Wiki Activity

Add selected device to list if not connected

Browse source 
This prevents a crash that happened if you selected a joystick device
and then unplugged it and went back to the input settings window.  The
crash happened because set_opts() tried to select the item in the list
when it did not exist.
This commit is contained in:
Robert Alm Nilsson 2018-07-17 14:22:45 +02:00
parent 1efbc580c5
commit 1b37ebd523
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/m64py/frontend/input.py
View file

@ -67,12 +67,21 @@ class Input(QDialog, Ui_InputDialog):
self.comboMode.currentIndexChanged.connect(
self.on_mode_changed)
def add_selected_device_if_not_in_list(self):
self.get_opts()
num = self.opts["device"][0]
if num >= 0 and num not in self.device_map:
device = self.tr("Joystick %s (%s)" % (num, "Unplugged"))
self.device_map[num] = ""
self.comboDevice.addItem(device, num)
def show_dialog(self):
self.config = self.parent.worker.core.config
self.config.open_section(self.section)
self.mode = self.config.get_parameter("mode")
self.device = self.config.get_parameter("device")
self.is_joystick = bool(self.device >= 0)
self.add_selected_device_if_not_in_list()
self.set_items()
self.set_enabled()
self.show()