diff options
| author | Sleepy Flower Girl <wuhao64@gmail.com> | 2018-08-06 17:56:40 -0400 |
|---|---|---|
| committer | Sleepy Flower Girl <wuhao64@gmail.com> | 2018-08-13 21:17:38 -0400 |
| commit | 158c0d54b1b4f332ab8fca897a8396bde5686e74 (patch) | |
| tree | f217f7b9cef0c054253a7becd0290a9aa6e11d31 /Source/Core/DolphinQt/MainWindow.cpp | |
| parent | c2aedb7649b09250485f96b85345afeb94a14eca (diff) | |
Force IPv4 on external IP addresses
Diffstat (limited to 'Source/Core/DolphinQt/MainWindow.cpp')
| -rw-r--r-- | Source/Core/DolphinQt/MainWindow.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Source/Core/DolphinQt/MainWindow.cpp b/Source/Core/DolphinQt/MainWindow.cpp index 7f016e5993..514308e548 100644 --- a/Source/Core/DolphinQt/MainWindow.cpp +++ b/Source/Core/DolphinQt/MainWindow.cpp @@ -640,7 +640,8 @@ void MainWindow::OnStopComplete() HideRenderWidget(); EnableScreenSaver(true); #ifdef USE_DISCORD_PRESENCE - Discord::UpdateDiscordPresence(); + if (!m_netplay_dialog->isVisible()) + Discord::UpdateDiscordPresence(); #endif SetFullScreenResolution(false); @@ -794,7 +795,8 @@ void MainWindow::StartGame(std::unique_ptr<BootParameters>&& parameters) ShowRenderWidget(); #ifdef USE_DISCORD_PRESENCE - Discord::UpdateDiscordPresence(); + if (!NetPlay::IsNetPlayRunning()) + Discord::UpdateDiscordPresence(); #endif if (SConfig::GetInstance().bFullscreen) @@ -1045,7 +1047,6 @@ void MainWindow::NetPlayInit() { m_netplay_setup_dialog = new NetPlaySetupDialog(this); m_netplay_dialog = new NetPlayDialog; - m_netplay_dialog = new NetPlayDialog(this); #ifdef USE_DISCORD_PRESENCE m_netplay_discord = new DiscordHandler(this); #endif @@ -1180,7 +1181,9 @@ void MainWindow::NetPlayQuit() { Settings::Instance().ResetNetPlayClient(); Settings::Instance().ResetNetPlayServer(); +#ifdef USE_DISCORD_PRESENCE Discord::UpdateDiscordPresence(); +#endif } void MainWindow::EnableScreenSaver(bool enable) |