exwm-systemtray--init, exwm-xsettings--init: Idempotent initialization

* exwm-systemtray.el (exwm-systemtray--init), exwm-xsettings.el (exwm-xsettings--init): Return early if already initialized.
emacs-exwm · Jun 6, 2024 · d41de49 · d41de49
1 parent 63bde86
commit d41de49
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/exwm-systemtray.el b/exwm-systemtray.el
@@ -491,7 +491,9 @@ Argument DATA contains the raw event data."
 (cl-defun exwm-systemtray--init ()
   "Initialize system tray module."
   (exwm--log)
-  (cl-assert (not exwm-systemtray--connection))
+  ;; idempotent initialization
+  (when exwm-systemtray--connection
+    (cl-return-from exwm-systemtray--init))
   (cl-assert (not exwm-systemtray--list))
   (cl-assert (not exwm-systemtray--selection-owner-window))
   (cl-assert (not exwm-systemtray--embedder-window))

diff --git a/exwm-xsettings.el b/exwm-xsettings.el
@@ -238,7 +238,9 @@ SERIAL is a sequence number."
   "Initialize the XSETTINGS module."
   (exwm--log)
 
-  (cl-assert (not exwm-xsettings--connection))
+  ;; idempotent initialization
+  (when exwm-xsettings--connection
+    (cl-return-from exwm-xsettings--init))
 
   ;; Connect
   (setq exwm-xsettings--connection (xcb:connect))