Fixed vurtun#657 contextual activation code

arsphe · Apr 4, 2018 · d374953 · d374953
1 parent 60bd95c
commit d374953
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/nuklear.h b/nuklear.h
@@ -16894,6 +16894,8 @@ nk_contextual_begin(struct nk_context *ctx, nk_flags flags, struct nk_vec2 size,
     NK_ASSERT(ctx->current->layout);
     if (!ctx || !ctx->current || !ctx->current->layout)
         return 0;
+    if (ctx->current != ctx->active)
+        return 0;
 
     win = ctx->current;
     ++win->popup.con_count;

diff --git a/src/nuklear_contextual.c b/src/nuklear_contextual.c
@@ -25,6 +25,8 @@ nk_contextual_begin(struct nk_context *ctx, nk_flags flags, struct nk_vec2 size,
     NK_ASSERT(ctx->current->layout);
     if (!ctx || !ctx->current || !ctx->current->layout)
         return 0;
+    if (ctx->current != ctx->active)
+        return 0;
 
     win = ctx->current;
     ++win->popup.con_count;