Merge branch 'nbarrientos.github.com/ib_exwm_conn_nil' into externals/exwm

1 files changed, 5 insertions, 5 deletions

diff --git a/exwm.el b/exwm.el
index 345f76beb66c..31fe6849559e 100644
--- a/exwm.el
+++ b/exwm.el
@@ -907,12 +907,12 @@ manager.  If t, replace it, if nil, abort and ask the user if `ask'."
   (run-hooks 'exwm-exit-hook)
   (setq confirm-kill-emacs nil)
   ;; Exit modules.
-  (exwm-input--exit)
-  (exwm-manage--exit)
-  (exwm-workspace--exit)
-  (exwm-floating--exit)
-  (exwm-layout--exit)
   (when exwm--connection
+    (exwm-input--exit)
+    (exwm-manage--exit)
+    (exwm-workspace--exit)
+    (exwm-floating--exit)
+    (exwm-layout--exit)
     (xcb:flush exwm--connection)
     (xcb:disconnect exwm--connection))
   (setq exwm--connection nil)