Correct logic around enabling display-only device configuration

This commit is contained in:
2017-11-16 15:26:13 +01:00
parent b7862d76fb
commit df981f5c4d

View File

@@ -22,6 +22,7 @@ def setUseRequestedDevice(context,
# preferably non-display one. # preferably non-display one.
if requested_device == "": if requested_device == "":
device_found = False device_found = False
display_device = None
# Try to enable first non-display card. # Try to enable first non-display card.
for device in cpref.devices: for device in cpref.devices:
if device.type != device_type: if device.type != device_type:
@@ -29,6 +30,7 @@ def setUseRequestedDevice(context,
continue continue
if isDisplayDevice(device): if isDisplayDevice(device):
device.use = False device.use = False
display_device = device
elif not device_found or not device_single: elif not device_found or not device_single:
# Enable first non-display GPU. # Enable first non-display GPU.
device_found = True device_found = True
@@ -38,7 +40,7 @@ def setUseRequestedDevice(context,
device.use = False device.use = False
if not device_found: if not device_found:
# Only display devices, enable first of them. # Only display devices, enable first of them.
cpref.devices[0].use = True display_device.use = True
device_found = True device_found = True
else: else:
device_found = False device_found = False