Make some assumptions about video card. For example, default to 1 MB if the card's memory can't be probed. Most cards have at least 1 MB.

This fixes bug #7505.  Also, when they press restore, another card probe takes place.

1 files changed, 15 insertions, 6 deletions

diff --git a/iw/xconfig_gui.py b/iw/xconfig_gui.py
index 7cacde851..df8ccbb39 100644
--- a/iw/xconfig_gui.py
+++ b/iw/xconfig_gui.py
@@ -130,8 +130,6 @@ class XCustomWindow (InstallWindow):
         self.currentRes = self.res_combo.list.child_position (data)
 #        print self.currentRes
         self.selectedRes = self.res_list[self.currentRes]
-
-
         self.swap_monitor (self.currentRes)
 
 
@@ -742,7 +740,6 @@ class MonitorWindow (InstallWindow):
 
 
     def getScreen (self):
-
         # Don't configure X in reconfig mode.
         # in regular install, check to see if the XFree86 package is
         # installed.  If it isn't return None.
@@ -1010,6 +1007,8 @@ class XConfigWindow (InstallWindow):
         ics.setTitle (_("X Configuration"))
         ics.readHTML ("xconf")
         
+        self.todo.videoRamOriginal = 2
+
     def getNext (self):
         if self.skipme:
             return None
@@ -1053,6 +1052,8 @@ class XConfigWindow (InstallWindow):
                 self.todo.videoRamState = count
             count = count + 1
 
+#        print self.todo.x.vidRam
+
     def movetree (self, ctree, area, selected_node):
 #        print "movetree"
         self.ctree.freeze()
@@ -1116,10 +1117,11 @@ class XConfigWindow (InstallWindow):
         if self.todo.videoRamState != self.todo.videoRamOriginal:
             self.todo.videoRamState = self.todo.videoRamOriginal
 
+        self.todo.x.probe ()
         self.ramOption.remove_menu ()
         self.ramMenu.set_active (self.todo.videoRamOriginal)
         self.ramOption.set_menu (self.ramMenu)
-
+        
     def desktopCb (self, widget, desktop):
         self.newDesktop = desktop
 
@@ -1145,6 +1147,9 @@ class XConfigWindow (InstallWindow):
         else:
             self.todo.probedFlag = "TRUE"
 
+#        self.todo.x.probe ()
+
+
 
 
         self.newDesktop = ""
@@ -1723,13 +1728,17 @@ class XConfigWindow (InstallWindow):
 #            current = 0
             #--Some video cards don't return exact numbers, so we've got to do some hacks
 
-            vidRam = string.atoi (self.todo.x.vidRam)
+            try:
+                vidRam = string.atoi (self.todo.x.vidRam)
+            except:
+                vidRam = 1024
+                
 #            print vidRam
 
             for size in ram_sizes:
                 small = size - 64
 #                print size
-                #--Cards such as ATI Rage Mobility report 64k less ram than it should
+                #--Cards such as Mach64 and ATI Rage Mobility report 64k less ram than it should
 #                if size == self.todo.x.vidRam or small == self.todo.x.vidRam:
                 if size == vidRam or small == vidRam:
                     if self.todo.videoRamState == "":