Merge branch 'enable_experimental_m2ts_support' into experimental

[enigma2.git] / lib / python / Screens / About.py

diff --git a/lib/python/Screens/About.py b/lib/python/Screens/About.py
index 8db58e73664a0f6aecf54e26d205fd812141ad09..6cf0f7b4558fe445cf9107950efe304c02196c63 100644 (file)
--- a/lib/python/Screens/About.py
+++ b/lib/python/Screens/About.py
@@ -1,8 +1,7 @@
 from Screen import Screen
 from Components.ActionMap import ActionMap
 from Components.Sources.StaticText import StaticText
-from Components.Sources.Source import ObsoleteSource
-from Components.Harddisk import Harddisk
+from Components.Harddisk import harddiskmanager
 from Components.NimManager import nimmanager
 from Components.About import about
 
@@ -26,17 +25,18 @@ class About(Screen):
                self["FPVersion"] = StaticText(fp_version)
 
                nims = nimmanager.nimList()
-               for count in range(4):
+               for count in (0, 1, 2, 3):
                        if count < len(nims):
                                self["Tuner" + str(count)] = StaticText(nims[count])
                        else:
                                self["Tuner" + str(count)] = StaticText("")
 
                self["HDDHeader"] = StaticText(_("Detected HDD:"))
-               hdd = Harddisk(0)
-               if hdd.model() != "":
+               hddlist = harddiskmanager.HDDList()
+               hdd = hddlist and hddlist[0][1] or None
+               if hdd is not None and hdd.model() != "":
                        self["hddA"] = StaticText(_("%s\n(%s, %d MB free)") % (hdd.model(), hdd.capacity(),hdd.free()))
-               else:                   
+               else:
                        self["hddA"] = StaticText(_("none"))
 
                self["actions"] = ActionMap(["SetupActions", "ColorActions"],