Merge branch 'master' of git.calculate.ru:calculate2/calculate-client

pym/cl_fill_client.py

@@ -131,18 +131,22 @@ class fillVars(object, cl_base.glob_attr):
             confLines = open(xorgConfig,"r").readlines()
         except:
             return "off"
-        flagFoundLineComposite = False
         flagStartExtensions = False
+        lineCompositeTmp = ""
         lineComposite = ""
         for line in confLines:
-            if 'Section' in line and '"Extensions"' in line:
-                flagStartExtensions = True
-            if flagStartExtensions and\
-                'Option' in line and '"Composite"' in line:
-                    lineComposite = line
-            if 'EndSection' in line:
-                flagFoundLineComposite = True
-        if flagFoundLineComposite and lineComposite:
+            if flagStartExtensions:
+                if 'EndSection' in line:
+                    lineComposite = lineCompositeTmp
+                    break
+                elif 'Section' in line:
+                    break
+                if 'Option' in line and '"Composite"' in line:
+                    lineCompositeTmp = line
+            else:
+                if '"Extensions"' in line and 'Section' in line:
+                    flagStartExtensions = True
+        if lineComposite:
             listOpt = filter(lambda x: x.strip(), lineComposite.split('"'))
             if len(listOpt) == 3:
                 ret = listOpt[2].lower()