[FlashExpander/Swap]

* fix crash if disk empty
openatv · Jan 3, 2025 · a21ee37 · a21ee37
1 parent 814e594
commit a21ee37
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/lib/python/Screens/FlashExpander.py b/lib/python/Screens/FlashExpander.py
@@ -337,11 +337,12 @@ def readDevices(self, callback=None):
 
 		print("[FlashExpander] DEBUG: uuids -> ", uuids)
 
-		for (name, hdd) in harddiskmanager.HDDList():
-			print("[FlashExpander] DEBUG: HDDList", hdd.device, hdd.dev_path)
-			uuid, device = uuids.get(hdd.device)
-			if uuid:
-				self.deviceData[uuid] = (device, name)
+		if uuids:
+			for (name, hdd) in harddiskmanager.HDDList():
+				print("[FlashExpander] DEBUG: HDDList", hdd.device, hdd.dev_path)
+				uuid, device = uuids.get(hdd.device)
+				if uuid:
+					self.deviceData[uuid] = (device, name)
 
 		print("[FlashExpander] DEBUG: self.deviceData", self.deviceData)
 		self.updateStatus()

diff --git a/lib/python/Screens/StartWizard.py b/lib/python/Screens/StartWizard.py
@@ -152,14 +152,15 @@ def readSwapDevices(self, callback=None):
 					if disk:
 						uuids[disk] = (fileReadLine(join("/dev/uuid", fileName)), f"/dev/{fileName}")
 
-		for (name, hdd) in harddiskmanager.HDDList():
-			uuid, device = uuids.get(hdd.device)
-			if uuid:
-				self.deviceData[uuid] = (device, name)
-
-			print("[StartWizard] DEBUG readSwapDevicesCallback: %s" % str(self.deviceData))
-			if callback and callable(callback):
-				callback()
+		if uuids:
+			for (name, hdd) in harddiskmanager.HDDList():
+				uuid, device = uuids.get(hdd.device)
+				if uuid:
+					self.deviceData[uuid] = (device, name)
+
+		print("[StartWizard] DEBUG readSwapDevicesCallback: %s" % str(self.deviceData))
+		if callback and callable(callback):
+			callback()
 
 	def getFreeMemory(self):
 		memInfo = fileReadLines("/proc/meminfo", source=MODULE_NAME)