summaryrefslogtreecommitdiffstats
path: root/src/skel/glfw/glfw.cpp
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-06-03 08:26:33 +0200
committeraap <aap@papnet.eu>2020-06-03 08:26:33 +0200
commitad03d9543b4710eabcbbd83aada7848151fd6846 (patch)
tree8e862f33d6870757ff14ad0c79ad09e14c24a590 /src/skel/glfw/glfw.cpp
parentforgot the fucking file (diff)
parentMerge remote-tracking branch 'origin/master' into miami (diff)
downloadre3-ad03d9543b4710eabcbbd83aada7848151fd6846.tar
re3-ad03d9543b4710eabcbbd83aada7848151fd6846.tar.gz
re3-ad03d9543b4710eabcbbd83aada7848151fd6846.tar.bz2
re3-ad03d9543b4710eabcbbd83aada7848151fd6846.tar.lz
re3-ad03d9543b4710eabcbbd83aada7848151fd6846.tar.xz
re3-ad03d9543b4710eabcbbd83aada7848151fd6846.tar.zst
re3-ad03d9543b4710eabcbbd83aada7848151fd6846.zip
Diffstat (limited to 'src/skel/glfw/glfw.cpp')
-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 407418c7..a7194c0c 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;