Make sure frame is alive before calling make-frame-invisible #162

sebastiencs · Sep 9, 2022 · 4dc0d98 · 4dc0d98
1 parent f9cbbc7
commit 4dc0d98
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/company-box-doc.el b/company-box-doc.el
@@ -149,8 +149,7 @@ just grab the first candidate and press forward."
 
 (defun company-box-doc (selection frame)
   (when company-box-doc-enable
-    (-some-> (frame-local-getq company-box-doc-frame frame)
-      (make-frame-invisible))
+    (company-box-doc--hide frame)
     (when (timerp company-box-doc--timer)
       (cancel-timer company-box-doc--timer))
     (setq company-box-doc--timer
@@ -161,8 +160,9 @@ just grab the first candidate and press forward."
              (company-ensure-emulation-alist))))))
 
 (defun company-box-doc--hide (frame)
-  (-some-> (frame-local-getq company-box-doc-frame frame)
-    (make-frame-invisible)))
+  (let ((frame (frame-local-getq company-box-doc-frame frame)))
+    (and (frame-live-p frame)
+         (make-frame-invisible frame))))
 
 (defun company-box-doc-manually ()
   (interactive)

diff --git a/company-box.el b/company-box.el
@@ -305,7 +305,8 @@ Examples:
 
 (defun company-box--get-frame (&optional frame)
   "Return the company-box child frame on FRAME."
-  (frame-local-getq company-box-frame frame))
+  (let ((frame (frame-local-getq company-box-frame frame)))
+    (and (frame-live-p frame) frame)))
 
 (defsubst company-box--set-frame (frame)
   "Set the frame symbol ‘company-box-frame’ to FRAME."