Merge pull request #5910 from spycrab/qt_fix_netplay

Qt/NetPlay: Use TraversalClient::FailureReason
dolphin-emu · Aug 10, 2017 · 1584aec · 1584aec
2 parents e41a990 + 366d4c7
commit 1584aec
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/Source/Core/DolphinQt2/NetPlay/NetPlayDialog.cpp b/Source/Core/DolphinQt2/NetPlay/NetPlayDialog.cpp
@@ -497,23 +497,23 @@ void NetPlayDialog::OnConnectionLost()
   DisplayMessage(tr("Lost connection to NetPlay server..."), "red");
 }
 
-void NetPlayDialog::OnTraversalError(int error)
+void NetPlayDialog::OnTraversalError(TraversalClient::FailureReason error)
 {
   QueueOnObject(this, [this, error] {
     switch (error)
     {
-    case TraversalClient::BadHost:
+    case TraversalClient::FailureReason::BadHost:
       QMessageBox::critical(this, tr("Traversal Error"), tr("Couldn't look up central server"));
       QDialog::reject();
       break;
-    case TraversalClient::VersionTooOld:
+    case TraversalClient::FailureReason::VersionTooOld:
       QMessageBox::critical(this, tr("Traversal Error"),
                             tr("Dolphin is too old for traversal server"));
       QDialog::reject();
       break;
-    case TraversalClient::ServerForgotAboutUs:
-    case TraversalClient::SocketSendError:
-    case TraversalClient::ResendTimeout:
+    case TraversalClient::FailureReason::ServerForgotAboutUs:
+    case TraversalClient::FailureReason::SocketSendError:
+    case TraversalClient::FailureReason::ResendTimeout:
       UpdateGUI();
       break;
     }

diff --git a/Source/Core/DolphinQt2/NetPlay/NetPlayDialog.h b/Source/Core/DolphinQt2/NetPlay/NetPlayDialog.h
@@ -46,7 +46,7 @@ class NetPlayDialog : public QDialog, public NetPlayUI
   void OnPadBufferChanged(u32 buffer) override;
   void OnDesync(u32 frame, const std::string& player) override;
   void OnConnectionLost() override;
-  void OnTraversalError(int error) override;
+  void OnTraversalError(TraversalClient::FailureReason error) override;
   bool IsRecording() override;
   std::string FindGame(const std::string& game) override;
   void ShowMD5Dialog(const std::string& file_identifier) override;