From f8d684d6fbeb9cd2b4af04ce87ac3b5b9b8f9da8 Mon Sep 17 00:00:00 2001
From: okan
Date: Tue, 2 Sep 2014 14:08:39 +0000
Subject: bring menu bits closer together

---
 mousefunc.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'mousefunc.c')

diff --git a/mousefunc.c b/mousefunc.c
index b1678ac..2cd9d6e 100644
--- a/mousefunc.c
+++ b/mousefunc.c
@@ -16,7 +16,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $OpenBSD: mousefunc.c,v 1.75 2014/09/01 18:17:32 okan Exp $
+ * $OpenBSD: mousefunc.c,v 1.76 2014/09/02 14:08:39 okan Exp $
  */
 
 #include <sys/param.h>
@@ -197,8 +197,8 @@ mousefunc_menu_group(struct client_ctx *cc, union arg *arg)
 	if (TAILQ_EMPTY(&menuq))
 		return;
 
-	mi = menu_filter(sc, &menuq, NULL, NULL, 0, NULL, NULL);
-	if (mi != NULL && mi->ctx != NULL) {
+	if ((mi = menu_filter(sc, &menuq, NULL, NULL, 0,
+	    NULL, NULL)) != NULL) {
 		gc = (struct group_ctx *)mi->ctx;
 		(group_hidden_state(gc)) ?
 		    group_show(sc, gc) : group_hide(sc, gc);
@@ -235,7 +235,6 @@ mousefunc_menu_unhide(struct client_ctx *cc, union arg *arg)
 	    NULL, NULL)) != NULL) {
 		cc = (struct client_ctx *)mi->ctx;
 		client_unhide(cc);
-
 		if (old_cc != NULL)
 			client_ptrsave(old_cc);
 		client_ptrwarp(cc);
-- 
cgit v1.2.3-2-gb3c3