diff options
| author | Admiral H. Curtiss <pikachu025@gmail.com> | 2024-05-04 05:15:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-04 05:15:35 +0200 |
| commit | c23562b7b5f43d27dab62ce6e3a25a2c3c35aed4 (patch) | |
| tree | 6d5c4a791536291fb105f60a6a37603fc76d9996 /Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp | |
| parent | e2dc6f3225c732f3896a9adf1f3ffc60d2b4f28f (diff) | |
| parent | 0df401b164bbe2b0314b74f1fd6385e852bbe098 (diff) | |
Merge pull request #12695 from mitaclaw/core-global-system-4
Core::IsRunning: Avoid Global System Accessor
Diffstat (limited to 'Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp')
| -rw-r--r-- | Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp b/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp index d7323b59e3..4ae4b5f315 100644 --- a/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp +++ b/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp @@ -43,6 +43,7 @@ #include "Core/IOS/FS/FileSystem.h" #include "Core/NetPlayServer.h" #include "Core/SyncIdentifier.h" +#include "Core/System.h" #include "DolphinQt/NetPlay/ChunkedProgressDialog.h" #include "DolphinQt/NetPlay/GameDigestDialog.h" @@ -578,7 +579,7 @@ void NetPlayDialog::UpdateDiscordPresence() m_current_game_name); }; - if (Core::IsRunning()) + if (Core::IsRunning(Core::System::GetInstance())) return use_default(); if (IsHosting()) @@ -802,7 +803,7 @@ void NetPlayDialog::DisplayMessage(const QString& msg, const std::string& color, QColor c(color.empty() ? QStringLiteral("white") : QString::fromStdString(color)); - if (g_ActiveConfig.bShowNetPlayMessages && Core::IsRunning()) + if (g_ActiveConfig.bShowNetPlayMessages && Core::IsRunning(Core::System::GetInstance())) g_netplay_chat_ui->AppendChat(msg.toStdString(), {static_cast<float>(c.redF()), static_cast<float>(c.greenF()), static_cast<float>(c.blueF())}); @@ -902,7 +903,7 @@ void NetPlayDialog::OnMsgStopGame() void NetPlayDialog::OnMsgPowerButton() { - if (!Core::IsRunning()) + if (!Core::IsRunning(Core::System::GetInstance())) return; QueueOnObject(this, [] { UICommon::TriggerSTMPowerEvent(); }); } |