summaryrefslogtreecommitdiffstats
path: root/src/skel
diff options
context:
space:
mode:
authorerorcun <erayorcunus@gmail.com>2020-05-28 21:06:50 +0200
committerGitHub <noreply@github.com>2020-05-28 21:06:50 +0200
commite65a09ea09ccc60c10e4969f8b98c3dfb7566f0f (patch)
tree3dc76df5c75331a6fa3ba98706a57a2571a2367f /src/skel
parentfix (diff)
parentremove inlining attempts + reload frontend options for real (diff)
downloadre3-e65a09ea09ccc60c10e4969f8b98c3dfb7566f0f.tar
re3-e65a09ea09ccc60c10e4969f8b98c3dfb7566f0f.tar.gz
re3-e65a09ea09ccc60c10e4969f8b98c3dfb7566f0f.tar.bz2
re3-e65a09ea09ccc60c10e4969f8b98c3dfb7566f0f.tar.lz
re3-e65a09ea09ccc60c10e4969f8b98c3dfb7566f0f.tar.xz
re3-e65a09ea09ccc60c10e4969f8b98c3dfb7566f0f.tar.zst
re3-e65a09ea09ccc60c10e4969f8b98c3dfb7566f0f.zip
Diffstat (limited to 'src/skel')
-rw-r--r--src/skel/glfw/glfw.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/skel/glfw/glfw.cpp b/src/skel/glfw/glfw.cpp
index 21115585..3ef0ab63 100644
--- a/src/skel/glfw/glfw.cpp
+++ b/src/skel/glfw/glfw.cpp
@@ -1747,7 +1747,7 @@ void CapturePad(RwInt32 padID)
void joysChangeCB(int jid, int event)
{
- if (event == GLFW_CONNECTED)
+ if (event == GLFW_CONNECTED && !IsThisJoystickBlacklisted(jid))
{
if (PSGLOBAL(joy1id) == -1)
PSGLOBAL(joy1id) = jid;