Merge pull request #8211 from spycrab/netplay_index_empty_error

Core/NetPlayServer: Fix empty error messages when adding session
dolphin-emu · Jun 22, 2019 · 981925a · 981925a
2 parents 84b9b37 + d68f62c
commit 981925a
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/Source/Core/Core/NetPlayServer.cpp b/Source/Core/Core/NetPlayServer.cpp
@@ -206,7 +206,10 @@ void NetPlayServer::SetupIndex()
   session.EncryptID(Config::Get(Config::NETPLAY_INDEX_PASSWORD));
 
   if (m_dialog != nullptr)
-    m_dialog->OnIndexAdded(m_index.Add(session), m_index.GetLastError());
+  {
+    bool success = m_index.Add(session);
+    m_dialog->OnIndexAdded(success, success ? "" : m_index.GetLastError());
+  }
 
   m_index.SetErrorCallback([this] {
     if (m_dialog != nullptr)