From 802512616c9f7b3a7c0f580ff39ec70fb4efac50 Mon Sep 17 00:00:00 2001 From: Mike Fulbright Date: Thu, 31 Jan 2002 20:18:25 +0000 Subject: don't assume we got sane ddc probe results --- monitor.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'monitor.py') diff --git a/monitor.py b/monitor.py index 30edfbe98..fc45b7562 100644 --- a/monitor.py +++ b/monitor.py @@ -215,7 +215,6 @@ class MonitorInfo: monVert = None if monitor: - self.orig_use_probed = 1 monEisa = monitor[0].id # only guess the timings if something is non-zero @@ -228,12 +227,16 @@ class MonitorInfo: monVert = "%d-%d" % (monitor[0].vertRefreshMin, monitor[0].vertRefreshMax) - monName = "" if monitor[0].desc != None: monName = monitor[0].desc - self.probedMonitor = (monEisa, monName, monHoriz, monVert) - self.setSpecs(monHoriz, monVert, id="DDCPROBED", name=monName) + if monVert != None and monHoriz != None and monitor[0].desc != None: + self.probedMonitor = (monEisa, monName, monHoriz, monVert) + self.setSpecs(monHoriz, monVert, id="DDCPROBED", name=monName) + self.orig_use_probed = 1 + else: + log("ddcprobe returned bogus values: %s" % (monitor,)) + except: log("ddcprobe failed") pass -- cgit