summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsl1nk3.s <sl1nk3.s@gmail.com>2009-06-04 00:32:59 +0000
committersl1nk3.s <sl1nk3.s@gmail.com>2009-06-04 00:32:59 +0000
commit6525ca5c582eaf7eb33afa109d3d4cbecbeb2d4f (patch)
tree115d5c618f79a014452f997a562f188641cb03d5
parentba3ceeafb7ecc18bb88dfdd75428c8606921756b (diff)
Fix resizing problems when rendering to main (here's your fix JP :p) + another wiimote recording crash
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3318 8ced0084-cf51-0410-be5f-012b33b47a6e
-rw-r--r--Source/Core/DolphinWX/Src/FrameTools.cpp2
-rw-r--r--Source/Plugins/Plugin_Wiimote/Src/ConfigRecording.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp
index cb8c2f49ec..64cb867b66 100644
--- a/Source/Core/DolphinWX/Src/FrameTools.cpp
+++ b/Source/Core/DolphinWX/Src/FrameTools.cpp
@@ -657,7 +657,6 @@ void CFrame::OnHelp(wxCommandEvent& event)
void CFrame::OnNetPlay(wxCommandEvent& WXUNUSED (event))
{
#if defined(HAVE_SFML) && HAVE_SFML
-
new NetPlay(this, m_GameListCtrl->GetGamePaths(), m_GameListCtrl->GetGameNames());
#endif
}
@@ -715,6 +714,7 @@ void CFrame::OnLoadState(wxCommandEvent& event)
void CFrame::OnResize(wxSizeEvent& event)
{
+ FitInside();
DoMoveIcons(); // In FrameWiimote.cpp
event.Skip();
}
diff --git a/Source/Plugins/Plugin_Wiimote/Src/ConfigRecording.cpp b/Source/Plugins/Plugin_Wiimote/Src/ConfigRecording.cpp
index 4dcd490c2c..382a1652b0 100644
--- a/Source/Plugins/Plugin_Wiimote/Src/ConfigRecording.cpp
+++ b/Source/Plugins/Plugin_Wiimote/Src/ConfigRecording.cpp
@@ -454,7 +454,7 @@ void ConfigDialog::RecordMovement(wxCommandEvent& event)
m_RecordButton[m_iRecordTo]->SetLabel(wxT("Press +"));
// This is for usability purposes, it may not be obvious at all that this must be unchecked
// for the recording to work
- for(int i = 0; i < 4; i++) m_UseRealWiimote[i]->SetValue(false); g_Config.bUseRealWiimote = false;
+ for(int i = 0; i < 1; i++) m_UseRealWiimote[i]->SetValue(false); g_Config.bUseRealWiimote = false;
return;
}