piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Qt/NetPlay: Show feedback for index adding

Browse Source
This commit is contained in:
spycrab
2019-04-11 01:21:40 +02:00
parent d90d641ec7
commit 8b6bb39e82
6 changed files with 50 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Core/UICommon/NetPlayIndex.cpp
View File

@ -142,6 +142,8 @@ void NetPlayIndex::NotificationLoop()
if (!json)
{
m_last_error = "BAD_JSON";
m_secret.clear();
m_error_callback();
return;
}
@ -150,6 +152,8 @@ void NetPlayIndex::NotificationLoop()
if (status != "OK")
{
m_last_error = std::move(status);
m_secret.clear();
m_error_callback();
return;
}
}
@ -318,3 +322,13 @@ const std::string& NetPlayIndex::GetLastError() const
{
return m_last_error;
}
bool NetPlayIndex::HasActiveSession() const
{
return !m_secret.empty();
}
void NetPlayIndex::SetErrorCallback(std::function<void()> function)
{
m_error_callback = function;
}

7
Source/Core/UICommon/NetPlayIndex.h
View File

@ -4,6 +4,7 @@
#pragma once
#include <functional>
#include <map>
#include <optional>
#include <string>
@ -46,12 +47,16 @@ public:
bool Add(NetPlaySession session);
void Remove();
bool HasActiveSession() const;
void SetPlayerCount(int player_count);
void SetInGame(bool in_game);
void SetGame(std::string game);
const std::string& GetLastError() const;
void SetErrorCallback(std::function<void()> callback);
private:
void NotificationLoop();
@ -64,4 +69,6 @@ private:
std::thread m_session_thread;
Common::Event m_session_thread_exit_event;
std::function<void()> m_error_callback = nullptr;
};