Fix wrong L&F on Ubuntu

Closes qzind#716
pavlovaleksei · Sep 24, 2020 · 52ecaba · 52ecaba
1 parent d2e18ce
commit 52ecaba
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/src/qz/installer/LinuxInstaller.java b/src/qz/installer/LinuxInstaller.java
@@ -186,6 +186,9 @@ public void spawn(List<String> args) throws Exception {
         HashMap<String, String> tempEnv = new HashMap<>();
         ArrayList<String> toExport = new ArrayList<>(Arrays.asList(SUDO_EXPORTS));
         for(String pid : pids) {
+            if(pid.isEmpty()) {
+                continue;
+            }
             try {
                 String[] vars;
                 if(SystemUtilities.isSolaris()) {
@@ -226,6 +229,13 @@ public void spawn(List<String> args) throws Exception {
             } else {
                 log.debug("Expected USER={} but got USER={}, skipping results for {}", whoami, tempEnv.get("USER"), pid);
             }
+
+            // Use gtk theme
+            if(env.containsKey("XDG_CURRENT_DESKTOP") && !env.containsKey("GNOME_DESKTOP_SESSION_ID")) {
+                if(env.get("XDG_CURRENT_DESKTOP").toLowerCase().contains("gnome")) {
+                    env.put("GNOME_DESKTOP_SESSION_ID", "this-is-deprecated");
+                }
+            }
         }
 
         if(env.size() == 0) {