Merge pull request #1145 from RachelBryk/buffer

Change netplay buffer SpinCtrl to default to 5.
dolphin-emu · Sep 22, 2014 · d4952c7 · d4952c7
2 parents dd6ebd2 + ad460a2
commit d4952c7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Source/Core/DolphinWX/NetWindow.cpp b/Source/Core/DolphinWX/NetWindow.cpp
@@ -50,7 +50,7 @@
 class wxWindow;
 
 #define NETPLAY_TITLEBAR  "Dolphin NetPlay"
-#define INITIAL_PAD_BUFFER_SIZE 20
+#define INITIAL_PAD_BUFFER_SIZE 5
 
 BEGIN_EVENT_TABLE(NetPlayDiag, wxFrame)
 	EVT_COMMAND(wxID_ANY, wxEVT_THREAD, NetPlayDiag::OnThread)
@@ -382,7 +382,7 @@ NetPlayDiag::NetPlayDiag(wxWindow* const parent, const CGameListCtrl* const game
 		bottom_szr->Add(m_start_btn);
 
 		bottom_szr->Add(new wxStaticText(panel, wxID_ANY, _("Buffer:")), 0, wxLEFT | wxCENTER, 5 );
-		wxSpinCtrl* const padbuf_spin = new wxSpinCtrl(panel, wxID_ANY, "20"
+		wxSpinCtrl* const padbuf_spin = new wxSpinCtrl(panel, wxID_ANY, std::to_string(INITIAL_PAD_BUFFER_SIZE)
 			, wxDefaultPosition, wxSize(64, -1), wxSP_ARROW_KEYS, 0, 200, INITIAL_PAD_BUFFER_SIZE);
 		padbuf_spin->Bind(wxEVT_SPINCTRL, &NetPlayDiag::OnAdjustBuffer, this);
 		bottom_szr->Add(padbuf_spin, 0, wxCENTER);