Add option to use weak mods in key overrides, fix when NO_ACTION_ONES…

…HOT is defined

quantum/key_override.c

@@ -472,9 +472,17 @@ bool process_key_override(const uint16_t keycode, const keyrecord_t *const recor
         return true;
     }
 
-    // Locked one shot mods are added to get_mods() (why??) while oneshot mods are in get_oneshot_mods().
-    uint8_t effective_mods = get_mods() | get_oneshot_mods();
-
+    uint8_t effective_mods = get_mods();
+
+#ifdef KEY_OVERRIDE_INCLUDE_WEAK_MODS
+    effective_mods |= get_weak_mods();
+#endif
+
+#ifndef NO_ACTION_ONESHOT
+    // Locked one shot mods are added to get_mods(), I think (why??) while oneshot mods are in get_oneshot_mods(). Still OR with get_locked_oneshot_mods because that's where those mods _should_ be saved.
+    effective_mods |= get_oneshot_locked_mods() | get_oneshot_mods();
+#endif
+
     if (is_mod) {
         // The mods returned from get_mods() will be updated with this new event _after_ this code runs. Hence we manually update the effective mods here to really know the effective mods.
         if (key_down) {