From e9231d34483fa7561a9863852e5401308ad4791d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marta=20Marczykowska-G=C3=B3recka?=
 <marta.maria.gorecka@gmail.com>
Date: Mon, 31 Aug 2020 14:19:50 +0200
Subject: [PATCH] Fix Boot from Device error when no block devices were found

fixes QubesOS/qubes-issues#6018
---
 qubesmanager/bootfromdevice.py | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/qubesmanager/bootfromdevice.py b/qubesmanager/bootfromdevice.py
index dfdd3a6..e73493d 100644
--- a/qubesmanager/bootfromdevice.py
+++ b/qubesmanager/bootfromdevice.py
@@ -115,12 +115,18 @@ class VMBootFromDeviceWindow(ui_bootfromdevice.Ui_BootDialog,
                 # insufficient permissions
                 pass
 
-        utils.initialize_widget(
-            widget=self.blockDeviceComboBox,
-            choices=device_choice,
-            selected_value=device_choice[0][1],
-            add_current_label=False
-        )
+        if device_choice:
+            utils.initialize_widget(
+                widget=self.blockDeviceComboBox,
+                choices=device_choice,
+                selected_value=device_choice[0][1],
+                add_current_label=False
+            )
+        else:
+            self.blockDeviceRadioButton.setEnabled(False)
+            self.blockDeviceComboBox.setEnabled(False)
+            self.blockDeviceComboBox.addItem("no block devices found!")
+            self.blockDeviceComboBox.setCurrentIndex(0)
 
     def radio_button_clicked(self):
         self.blockDeviceComboBox.setEnabled(