summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorAdmiral H. Curtiss <pikachu025@gmail.com>2023-08-18 21:28:52 +0200
committerGitHub <noreply@github.com>2023-08-18 21:28:52 +0200
commit8a96ce73f6908ebe290bfbe4e683702cabc8497b (patch)
tree9f8bd6ae80f32d5487446d5abcddb52a7473c224 /Source
parentb3faca5be9af9b10cafe3b45bafd14af1eae8b3c (diff)
parent550b9782e140e244575b0b6bee877ce1700ef733 (diff)
Merge pull request #12044 from jmlee337/upnpport
Do not try portmapping when using traversal server
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/Core/NetPlayServer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/Core/NetPlayServer.cpp b/Source/Core/Core/NetPlayServer.cpp
index 5452d9e80f..7c49d7b1da 100644
--- a/Source/Core/Core/NetPlayServer.cpp
+++ b/Source/Core/Core/NetPlayServer.cpp
@@ -169,7 +169,7 @@ NetPlayServer::NetPlayServer(const u16 port, const bool forward_port, NetPlayUI*
m_chunked_data_thread = std::thread(&NetPlayServer::ChunkedDataThreadFunc, this);
#ifdef USE_UPNP
- if (forward_port)
+ if (forward_port && !traversal_config.use_traversal)
Common::UPnP::TryPortmapping(port);
#endif
}