From c2aedb7649b09250485f96b85345afeb94a14eca Mon Sep 17 00:00:00 2001 From: Sleepy Flower Girl Date: Fri, 20 Jul 2018 18:27:43 -0400 Subject: Adds a UI for accepting Discord join requests in Dolphin also did these things fixed crash from joining user that isn't hosting via a direct connection current game stat can now pass to override the current game in config uses ip endpoint from dolphin.org --- Source/Core/DolphinQt/MainWindow.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'Source/Core/DolphinQt/MainWindow.cpp') diff --git a/Source/Core/DolphinQt/MainWindow.cpp b/Source/Core/DolphinQt/MainWindow.cpp index 4804b469bc..7f016e5993 100644 --- a/Source/Core/DolphinQt/MainWindow.cpp +++ b/Source/Core/DolphinQt/MainWindow.cpp @@ -1044,12 +1044,11 @@ void MainWindow::BootWiiSystemMenu() void MainWindow::NetPlayInit() { m_netplay_setup_dialog = new NetPlaySetupDialog(this); -<<<<<<< HEAD:Source/Core/DolphinQt/MainWindow.cpp m_netplay_dialog = new NetPlayDialog; -======= m_netplay_dialog = new NetPlayDialog(this); - m_netplay_discord = new DiscordHandler(); ->>>>>>> Add Discord Join Net Play functionally:Source/Core/DolphinQt2/MainWindow.cpp +#ifdef USE_DISCORD_PRESENCE + m_netplay_discord = new DiscordHandler(this); +#endif connect(m_netplay_dialog, &NetPlayDialog::Boot, this, [this](const QString& path) { StartGame(path); }); @@ -1057,10 +1056,12 @@ void MainWindow::NetPlayInit() connect(m_netplay_dialog, &NetPlayDialog::rejected, this, &MainWindow::NetPlayQuit); connect(m_netplay_setup_dialog, &NetPlaySetupDialog::Join, this, &MainWindow::NetPlayJoin); connect(m_netplay_setup_dialog, &NetPlaySetupDialog::Host, this, &MainWindow::NetPlayHost); +#ifdef USE_DISCORD_PRESENCE connect(m_netplay_discord, &DiscordHandler::Join, this, &MainWindow::NetPlayJoin); - Discord::InitNetPlayFunctionality([this] { m_netplay_discord->DiscordJoin(); }); + Discord::InitNetPlayFunctionality(*m_netplay_discord); m_netplay_discord->Start(); +#endif } bool MainWindow::NetPlayJoin() -- cgit v1.2.3