From: fauxpark <fauxpark@gmail.com>
Date: Wed, 29 May 2019 14:45:28 +0000 (+1000)
Subject: Fix TO() and DF() calling layer_state_set_[kb,user] twice (#6003)
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=d16056e60a4ac20ad4b2d7bef3ecebe82d22674b;p=qmk_firmware.git

Fix TO() and DF() calling layer_state_set_[kb,user] twice (#6003)
---

diff --git a/tmk_core/common/action.c b/tmk_core/common/action.c
index 3991a8a9e..6a560229a 100644
--- a/tmk_core/common/action.c
+++ b/tmk_core/common/action.c
@@ -412,7 +412,7 @@ void process_action(keyrecord_t *record, action_t action)
                         case OP_BIT_AND: default_layer_and(bits | mask); break;
                         case OP_BIT_OR:  default_layer_or(bits | mask);  break;
                         case OP_BIT_XOR: default_layer_xor(bits | mask); break;
-                        case OP_BIT_SET: default_layer_and(mask); default_layer_or(bits); break;
+                        case OP_BIT_SET: default_layer_set(bits | mask); break;
                     }
                 }
             } else {
@@ -426,7 +426,7 @@ void process_action(keyrecord_t *record, action_t action)
                         case OP_BIT_AND: layer_and(bits | mask); break;
                         case OP_BIT_OR:  layer_or(bits | mask);  break;
                         case OP_BIT_XOR: layer_xor(bits | mask); break;
-                        case OP_BIT_SET: layer_and(mask); layer_or(bits); break;
+                        case OP_BIT_SET: layer_state_set(bits | mask); break;
                     }
                 }
             }