summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorJosJuice <josjuice@gmail.com>2021-04-18 10:43:32 +0200
committerGitHub <noreply@github.com>2021-04-18 10:43:32 +0200
commitdbd39ab2a024670e1a1db7d906dd5d4487b15bb3 (patch)
treef248fc7a0b900622c4896fd58aa9e4a35c84a9e3 /Source/Core
parent92308f5e34d190ef0381595cbab8eb76a3739cc6 (diff)
parentd6b2fe2c0a663fa2feb0286a15c71a058aeb87fc (diff)
Merge pull request #9642 from CrunchBite/xlink-bba-fix
Fix crash when stopping a game that does not use the BBA when XLink Kai BBA is selected in configuration
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/Core/HW/EXI/BBA/XLINK_KAI_BBA.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/Core/Core/HW/EXI/BBA/XLINK_KAI_BBA.cpp b/Source/Core/Core/HW/EXI/BBA/XLINK_KAI_BBA.cpp
index 61e1eefb90..cb1c096ed0 100644
--- a/Source/Core/Core/HW/EXI/BBA/XLINK_KAI_BBA.cpp
+++ b/Source/Core/Core/HW/EXI/BBA/XLINK_KAI_BBA.cpp
@@ -58,6 +58,10 @@ bool CEXIETHERNET::XLinkNetworkInterface::Activate()
void CEXIETHERNET::XLinkNetworkInterface::Deactivate()
{
+ // Is the BBA Active? If not skip shutdown
+ if (!IsActivated())
+ return;
+
// Send d; to tell XLink we want to disconnect cleanly
// disconnect;optional_locally_unique_name;optional_padding
std::string cmd =