Fix LXQt detect issue by verifying that desktop_session is non-empty

hhannine · Oct 21, 2020 · 49ba61a · 49ba61a
1 parent be5b732
commit 49ba61a
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 22 deletions.
diff --git a/superpaper/spanmode.py b/superpaper/spanmode.py
@@ -26,29 +26,30 @@ def set_spanmode():
         winreg.SetValueEx(reg_key_desktop, "TileWallpaper", 0, winreg.REG_SZ, "0")
     elif pltf == "Linux":
         desk_env = os.environ.get("DESKTOP_SESSION")
-        if desk_env in ["gnome", "gnome-wayland",
-                          "unity", "ubuntu",
-                          "pantheon", "budgie-desktop",
-                          "pop"]:
-            subprocess.run(["gsettings", "set",
-                            "org.gnome.desktop.background", "picture-options",
-                            "spanned"])
-        elif desk_env in ["cinnamon"]:
-            subprocess.run(["gsettings", "set",
-                            "org.cinnamon.desktop.background", "picture-options",
-                            "spanned"])
-        elif desk_env in ["mate"]:
-            subprocess.run(["gsettings", "set",
-                            "org.mate.background", "picture-options",
-                            "spanned"])
-        elif desk_env and (desk_env.lower() == "lubuntu" or "lxqt" in desk_env.lower()):
-            try:
-                subprocess.run(["pcmanfm", "--wallpaper-mode=stretch"])
-            except OSError:
+        if desk_env:
+            if desk_env in ["gnome", "gnome-wayland",
+                            "unity", "ubuntu",
+                            "pantheon", "budgie-desktop",
+                            "pop"]:
+                subprocess.run(["gsettings", "set",
+                                "org.gnome.desktop.background", "picture-options",
+                                "spanned"])
+            elif desk_env in ["cinnamon"]:
+                subprocess.run(["gsettings", "set",
+                                "org.cinnamon.desktop.background", "picture-options",
+                                "spanned"])
+            elif desk_env in ["mate"]:
+                subprocess.run(["gsettings", "set",
+                                "org.mate.background", "picture-options",
+                                "spanned"])
+            elif desk_env.lower() == "lubuntu" or "lxqt" in desk_env.lower():
                 try:
-                    subprocess.run(["pcmanfm-qt", "--wallpaper-mode=stretch"])
+                    subprocess.run(["pcmanfm", "--wallpaper-mode=stretch"])
                 except OSError:
-                    pass
+                    try:
+                        subprocess.run(["pcmanfm-qt", "--wallpaper-mode=stretch"])
+                    except OSError:
+                        pass
     elif pltf == "Darwin":
         # Mac support TODO
         pass

diff --git a/superpaper/wallpaper_processing.py b/superpaper/wallpaper_processing.py
@@ -1437,7 +1437,7 @@ def set_wallpaper_linux(outputfile):
                             outputfile])
         elif desk_env in ["xfce", "xubuntu", "ubuntustudio"]:
             xfce_actions(outputfile)
-        elif desk_env and (desk_env.lower() == "lubuntu" or "lxqt" in desk_env.lower()):
+        elif desk_env.lower() == "lubuntu" or "lxqt" in desk_env.lower():
             try:
                 subprocess.run(["pcmanfm", "-w", outputfile])
             except OSError: