From 53c8d94cd2b2f1fe669ac39f8d5a01702202295b Mon Sep 17 00:00:00 2001
From: Ben Hamilton <bhamiltoncx@gmail.com>
Date: Wed, 22 Sep 2021 19:23:31 -0600
Subject: [PATCH] Fixes from @jdgleaver

---
 input/input_driver.c | 4 ++++
 retroarch.c          | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/input/input_driver.c b/input/input_driver.c
index 7150c5d39a3..60e269b1880 100644
--- a/input/input_driver.c
+++ b/input/input_driver.c
@@ -21,6 +21,7 @@
 #include <string/stdstring.h>
 #include <encodings/utf.h>
 #include <clamping.h>
+#include <retro_assert.h>
 
 #include "input_driver.h"
 #include "input_keymaps.h"
@@ -463,6 +464,9 @@ bool input_driver_button_combo(
       retro_time_t current_time,
       input_bits_t* p_input)
 {
+   retro_assert(input_driver_state != NULL);
+   retro_assert(p_input != NULL);
+
    switch (mode)
    {
       case INPUT_COMBO_DOWN_Y_L_R:
diff --git a/retroarch.c b/retroarch.c
index d8cf11a1cd8..6c006438852 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -28158,7 +28158,7 @@ static enum runloop_state runloop_check_state(
    if (
          ((menu_toggle_gamepad_combo != INPUT_COMBO_NONE) &&
           input_driver_button_combo(
-             &(p_rarch->input_driver_state),
+             input_driver_st,
              menu_toggle_gamepad_combo,
              current_time,
              &last_input)))
@@ -28331,7 +28331,7 @@ static enum runloop_state runloop_check_state(
       if (!trig_quit_key &&
           ((quit_gamepad_combo != INPUT_COMBO_NONE) &&
           input_driver_button_combo(
-             &(p_rarch->input_driver_state),
+             input_driver_st,
              quit_gamepad_combo,
              current_time,
              &current_bits)))