From 50ac407a9a3d7d6eeb2e5aa1cb57ebe65df555db Mon Sep 17 00:00:00 2001
From: Themaister <maister@archlinux.us>
Date: Wed, 11 Jun 2014 15:47:20 +0200
Subject: [PATCH] Avoid breaking autoconfig when inside a push/pop d-pad
 emulation block.

---
 input/input_common.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/input/input_common.c b/input/input_common.c
index 3a39eb7bcf..c379c43d83 100644
--- a/input/input_common.c
+++ b/input/input_common.c
@@ -1128,8 +1128,10 @@ void input_config_parse_joy_axis(config_file_t *conf, const char *prefix,
             bind->joyaxis = AXIS_POS(axis);
          else
             bind->joyaxis = AXIS_NEG(axis);
-
       }
+
+      // Ensure that d-pad emulation doesn't screw this over.
+      bind->orig_joyaxis = bind->joyaxis;
    }
 }