Merge pull request #440 from AdamWill/selected-level-none

Guard better against RaidChooser's selected_level being None
storaged-project · Jun 6, 2024 · 6ad9055 · 6ad9055
2 parents c0ca51f + 9958f9b
commit 6ad9055
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/blivetgui/dialogs/add_dialog.py b/blivetgui/dialogs/add_dialog.py
@@ -562,11 +562,12 @@ def raid_member_max_size(self):
 
  device_type = self.selected_type
  num_parents = self._get_number_selected_parents()
+ level = self._raid_chooser.selected_level
 
  if device_type not in self.supported_raids.keys() or num_parents == 1:
  return (False, None)
 
- elif self._raid_chooser.selected_level.name in ("linear", "single"):
+ elif level and level.name in ("linear", "single"):
  return (False, None)
 
  else:
@@ -863,7 +864,8 @@ def add_advanced_options(self):
  self.advanced.destroy()
 
  if device_type in ("lvm", "lvmvg", "partition", "mdraid"):
- if device_type == "mdraid" and self._raid_chooser.selected_level.name == "raid1":
+ level = self._raid_chooser.selected_level
+ if device_type == "mdraid" and level and level.name == "raid1":
  self.advanced = None
  self.widgets_dict["advanced"] = []
  else:
@@ -1068,7 +1070,9 @@ def get_selection(self):
  encryption_selection = self._encryption_chooser.get_selection()
 
  if device_type in ("btrfs volume", "mdraid", "lvmlv"):
- raid_level = self._raid_chooser.selected_level.name
+ raid_level = self._raid_chooser.selected_level
+ if raid_level:
+ raid_level = raid_level.name
  else:
  raid_level = None