Subject: (cherry-pick): Fixed bug [9e606527af] - && instead of & used in generic/tkOption.c

From: "jan.nijtmans" <[email-masked]>
Date: Sat, 23 Jan 2016 19:46:08 +0000

---
 generic/tkOption.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generic/tkOption.c b/generic/tkOption.c
index bff799b..17989f8 100644
--- a/generic/tkOption.c
+++ b/generic/tkOption.c
@@ -559,7 +559,7 @@ Tk_GetOption(
 		count	-= levelPtr[-1].bases[currentStack];
 	    }
 
-	    if (currentStack && CLASS) {
+	    if (currentStack & CLASS) {
 		nodeId = winClassId;
 	    } else {
 		nodeId = winNameId;
-- 
cgit v0.12