summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinQt/MainWindow.cpp
diff options
context:
space:
mode:
authorspycrab <spycrab@users.noreply.github.com>2018-07-30 11:52:38 +0200
committerGitHub <noreply@github.com>2018-07-30 11:52:38 +0200
commit2a776bf2b6ebefbb064f3f418f0c2b31c7ae10b7 (patch)
treec312f1194fb75b86b779b14632b99f51395ca314 /Source/Core/DolphinQt/MainWindow.cpp
parent7c2569ada7dcf6b88c1b978d1abaec42b230c39f (diff)
parentcfeffdcf4208686d64d509f559272d64bbd5da70 (diff)
Merge pull request #7258 from Techjar/netplay-fix-segfaults
Fix more segfaults on NetPlay quit
Diffstat (limited to 'Source/Core/DolphinQt/MainWindow.cpp')
-rw-r--r--Source/Core/DolphinQt/MainWindow.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/DolphinQt/MainWindow.cpp b/Source/Core/DolphinQt/MainWindow.cpp
index 30fdaef58f..f6f7ce1f9e 100644
--- a/Source/Core/DolphinQt/MainWindow.cpp
+++ b/Source/Core/DolphinQt/MainWindow.cpp
@@ -668,7 +668,7 @@ bool MainWindow::RequestStop()
const Core::State state = Core::GetState();
// Only pause the game, if NetPlay is not running
- bool pause = Settings::Instance().GetNetPlayClient() == nullptr;
+ bool pause = !Settings::Instance().GetNetPlayClient();
if (pause)
Core::SetState(Core::State::Paused);
@@ -1071,7 +1071,7 @@ bool MainWindow::NetPlayJoin()
std::string host_ip;
u16 host_port;
- if (Settings::Instance().GetNetPlayServer() != nullptr)
+ if (Settings::Instance().GetNetPlayServer())
{
host_ip = "127.0.0.1";
host_port = Settings::Instance().GetNetPlayServer()->GetPort();