From 63aa96864280ff07f706ebbae302b7c15abb964f Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 13 Aug 2021 20:04:45 +0000
Subject: Check callback needs to only return 0 (text should be suppressed) if
 menu returns 0, otherwise it should check the popup also.

---
 popup.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'popup.c')

diff --git a/popup.c b/popup.c
index 1783411a..95de58a9 100644
--- a/popup.c
+++ b/popup.c
@@ -162,12 +162,12 @@ popup_check_cb(struct client *c, void *data, u_int px, u_int py)
 {
 	struct popup_data	*pd = data;
 
+	if (pd->md != NULL && menu_check_cb(c, pd->md, px, py) == 0)
+		return (0);
 	if (px < pd->px || px > pd->px + pd->sx - 1)
 		return (1);
 	if (py < pd->py || py > pd->py + pd->sy - 1)
 		return (1);
-	if (pd->md != NULL)
-		return (menu_check_cb(c, pd->md, px, py));
 	return (0);
 }
 
-- 
cgit v1.2.3