From 0eeb65dc680ca089e83d0bc76442b2fa1604edc0 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Tue, 12 Apr 2011 10:40:23 +0400 Subject: [PATCH] Fix detect composite mode by cmd line. --- pym/cl_fill.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pym/cl_fill.py b/pym/cl_fill.py index 5b63520..d67eb18 100644 --- a/pym/cl_fill.py +++ b/pym/cl_fill.py @@ -446,9 +446,6 @@ class fillVars(varsShare): os.listdir(xorg_modules_dir))) else: list_avialable_drivers = [] - videoVal = self.getValueFromCmdLine("calculate",4) - if videoVal in list_avialable_drivers + ["auto"]: - return videoVal if display and list_avialable_drivers: reDriver = re.compile('|'.join(map(lambda x: "%s_drv.so"%x, list_avialable_drivers))) @@ -474,6 +471,11 @@ class fillVars(varsShare): matchSect.group(0),re.S) if resDriver and resDriver.group(1) in list_avialable_drivers: return resDriver.group(1) + + videoVal = self.getValueFromCmdLine("calculate",4) + videoVal = {'i915':'intel'}.get(videoVal,videoVal) + if videoVal in list_avialable_drivers: + return videoVal defaultDriver = { 'vesa':'vesa', 'nvidia':'nvidia' if "nvidia" in list_avialable_drivers else "nv",