]> git.donarmstrong.com Git - deb_pkgs/autorandr.git/commitdiff
AUTORANDR_MONITORS only contains current monitors
authorBrice Waegeneire <brice.wge@gmail.com>
Mon, 16 Jul 2018 17:35:52 +0000 (19:35 +0200)
committerBrice Waegeneire <brice.wge@gmail.com>
Tue, 17 Jul 2018 11:28:57 +0000 (13:28 +0200)
Signed-off-by: Brice Waegeneire <brice.wge@gmail.com>
autorandr.py

index 30fa225ade5599340d27e59fe052576c8c8b69fe..f3612cb6cca730c1d490eea1cb0924b1b7ffb247 100755 (executable)
@@ -1073,6 +1073,15 @@ def dispatch_call_to_sessions(argv):
             X11_displays_done.add(display)
 
 
+def enabled_monitors(config):
+    monitors = []
+    for monitor in config:
+        if "--off" in config[monitor].option_vector:
+            continue
+        monitors.append(monitor)
+    return monitors
+
+
 def read_config(options, directory):
     """Parse a configuration config.ini from directory and merge it into
     the options dictionary"""
@@ -1178,7 +1187,7 @@ def main(argv):
             exec_scripts(profile_folder, "postsave", {
                 "CURRENT_PROFILE": options["--save"],
                 "PROFILE_FOLDER": profile_folder,
-                "MONITORS": ":".join(config.keys()),
+                "MONITORS": ":".join(enabled_monitors(config)),
             })
         except Exception as e:
             raise AutorandrException("Failed to save current configuration as profile '%s'" % (options["--save"],), e)
@@ -1299,7 +1308,7 @@ def main(argv):
                 script_metadata = {
                     "CURRENT_PROFILE": load_profile,
                     "PROFILE_FOLDER": scripts_path,
-                    "MONITORS": ":".join(load_config.keys()),
+                    "MONITORS": ":".join(enabled_monitors(load_config)),
                 }
                 exec_scripts(scripts_path, "preswitch", script_metadata)
                 if "--debug" in options: