had to move where test occurs so only run when card has been probed

1 files changed, 17 insertions, 14 deletions

diff --git a/iw/xconfig_gui.py b/iw/xconfig_gui.py
index 88de343fe..4f770bd24 100644
--- a/iw/xconfig_gui.py
+++ b/iw/xconfig_gui.py
@@ -37,7 +37,7 @@ class XCustomWindow (InstallWindow):
 
         self.todo.x.manualModes = newmodes
         self.todo.x.setModes(newmodes)
-        
+
     def testPressed (self, widget, *args):
         newmodes = {}
 
@@ -260,19 +260,6 @@ class XConfigWindow (InstallWindow):
         
         self.didTest = 0
 
-        # cannot reliably test on i810 or Voodoo driver, or on Suns who dont
-        # need it since they are fixed resolution
-
-        self.cantprobe = 0
-        if not self.sunServer:
-            if self.todo.x.vidCards[self.todo.x.primary].has_key("DRIVER"):
-                curdriver = self.todo.x.vidCards[self.todo.x.primary]["DRIVER"]
-                noprobedriverList = ("i810", "tdfx")
-                for adriver in noprobedriverList:
-                    if curdriver == adriver:
-                        self.cantprobe = 1
-        else:
-            self.cantprobe = 1
 
     def getNext (self):
         if self.skipme:
@@ -450,6 +437,22 @@ class XConfigWindow (InstallWindow):
             box.pack_start (table, FALSE)
         optbox = GtkVBox (FALSE, 5)
 
+
+        # cannot reliably test on i810 or Voodoo driver, or on Suns who dont
+        # need it since they are fixed resolution
+
+        self.cantprobe = 0
+        if not self.sunServer and self.todo.x.vidCards != []:
+            if self.todo.x.vidCards[self.todo.x.primary].has_key("DRIVER"):
+                curdriver = self.todo.x.vidCards[self.todo.x.primary]["DRIVER"]
+                noprobedriverList = ("i810", "tdfx")
+                for adriver in noprobedriverList:
+                    if curdriver == adriver:
+                        self.cantprobe = 1
+        else:
+            self.cantprobe = 1
+
+
         if not self.cantprobe:
             test = GtkAlignment ()
             button = GtkButton (_("Test this configuration"))