Fix settings override

Author: ericdallo

src/main/clojure/com/github/clojure_lsp/intellij/extension/general_settings.clj

@@ -135,8 +135,10 @@
 (defn -apply [_]
   (let [settings-state (SettingsState/get)
         trace-level (s/config (s/select @component* [:#trace-level]) :selected-item)
-        server-log-path (s/config (s/select @component* [:#server-log]) :text)
-        server-path (s/config (s/select @component* [:#server-path]) :text)]
+        server-log-path (when (s/config (s/select @component* [:#custom-server-log?]) :selected?)
+                          (s/config (s/select @component* [:#server-log]) :text))
+        server-path (when (s/config (s/select @component* [:#custom-server-path?]) :selected?)
+                      (s/config (s/select @component* [:#server-path]) :text))]
     (db/set-server-path-setting! settings-state server-path)
     (db/set-server-log-path-setting! settings-state server-log-path)
     (db/set-trace-level-setting! settings-state trace-level)))

src/main/clojure/com/github/clojure_lsp/intellij/server.clj

@@ -34,7 +34,7 @@
 
 (defn ^:private clean-up-server []
   (when (and (:server-process @db/db*) (p/alive? (:server-process @db/db*)))
-    (p/destroy-tree (:server-process @db/db*)))
+    (p/destroy (:server-process @db/db*)))
   (swap! db/db* assoc :status :disconnected
          :client nil
          :server-process nil