diff options
| author | Matthew Parlane <parlane@gmail.com> | 2017-02-08 18:12:56 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-08 18:12:56 +1300 |
| commit | f456fcec48cdb890ff8b03ca73688ae1c43eab46 (patch) | |
| tree | ab19ff1c2730642ad53f7f4feb22534ca771d119 /Source/Core/DolphinWX/FrameTools.cpp | |
| parent | 691abc223bce85e9857942214748dc6bba4216db (diff) | |
| parent | c41f587c291cc8216c1d9c40254eea5d776d2699 (diff) | |
Merge pull request #4840 from lioncash/net
NetWindow: Eliminate usages of the main_window global
Diffstat (limited to 'Source/Core/DolphinWX/FrameTools.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/FrameTools.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index fb69f6ac0c..c40e6d0916 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -501,7 +501,7 @@ void CFrame::OnRecordExport(wxCommandEvent& WXUNUSED(event)) DoRecordingSave(); } -void CFrame::OnPlay(wxCommandEvent& WXUNUSED(event)) +void CFrame::OnPlay(wxCommandEvent& event) { if (Core::IsRunning()) { @@ -526,7 +526,7 @@ void CFrame::OnPlay(wxCommandEvent& WXUNUSED(event)) else { // Core is uninitialized, start the game - BootGame(""); + BootGame(WxStrToStr(event.GetString())); } } |
