Skip to content
Permalink
Browse files

Merge pull request #7964 from Techjar/fix-netplayindex-segfault

UICommon/NetPlayIndex: Fix random segfaults after quitting NetPlay
  • Loading branch information...
spycrab committed Apr 9, 2019
2 parents 22f5590 + dc552f2 commit 746849f8919d0f3b28738d2e70c4fdb707e01dd7
Showing with 6 additions and 13 deletions.
  1. +3 −10 Source/Core/UICommon/NetPlayIndex.cpp
  2. +3 −3 Source/Core/UICommon/NetPlayIndex.h
@@ -4,6 +4,7 @@

#include "UICommon/NetPlayIndex.h"

#include <chrono>
#include <numeric>
#include <string>

@@ -124,7 +125,7 @@ NetPlayIndex::List(const std::map<std::string, std::string>& filters)

void NetPlayIndex::NotificationLoop()
{
while (m_running.IsSet())
while (!m_session_thread_exit_event.WaitFor(std::chrono::seconds(5)))
{
Common::HttpRequest request;
auto response = request.Get(
@@ -141,7 +142,6 @@ void NetPlayIndex::NotificationLoop()
if (!json)
{
m_last_error = "BAD_JSON";
m_running.Set(false);
return;
}

@@ -150,18 +150,13 @@ void NetPlayIndex::NotificationLoop()
if (status != "OK")
{
m_last_error = std::move(status);
m_running.Set(false);
return;
}

Common::SleepCurrentThread(1000 * 5);
}
}

bool NetPlayIndex::Add(NetPlaySession session)
{
m_running.Set(true);

Common::HttpRequest request;
auto response = request.Get(Config::Get(Config::NETPLAY_INDEX_URL) +
"/v0/session/add?name=" + request.EscapeComponent(session.name) +
@@ -204,8 +199,6 @@ bool NetPlayIndex::Add(NetPlaySession session)

m_session_thread = std::thread([this] { NotificationLoop(); });

m_session_thread.detach();

return true;
}

@@ -229,7 +222,7 @@ void NetPlayIndex::Remove()
if (m_secret.empty())
return;

m_running.Set(false);
m_session_thread_exit_event.Set();

if (m_session_thread.joinable())
m_session_thread.join();
@@ -11,7 +11,7 @@
#include <utility>
#include <vector>

#include "Common/Flag.h"
#include "Common/Event.h"

struct NetPlaySession
{
@@ -55,13 +55,13 @@ class NetPlayIndex
private:
void NotificationLoop();

Common::Flag m_running;

std::string m_secret;
std::string m_game;
int m_player_count = 0;
bool m_in_game = false;

std::string m_last_error;
std::thread m_session_thread;

Common::Event m_session_thread_exit_event;
};

0 comments on commit 746849f

Please sign in to comment.
You can’t perform that action at this time.