diff options
| author | Soren Jorvang <soren.jorvang@gmail.com> | 2011-01-21 02:56:54 +0000 |
|---|---|---|
| committer | Soren Jorvang <soren.jorvang@gmail.com> | 2011-01-21 02:56:54 +0000 |
| commit | 7834880925f91d845283babece4a020bdb80d505 (patch) | |
| tree | aeca258bef9d41723186c4036e8bfc10e0fa2633 /Source/Core | |
| parent | 46844174090fb659228539e34cfdc95faed5963a (diff) | |
Make sure the game list gets created with automatic starts.
When rendering to the main window, the wxGLCanvas should really
be owned by the DolphinWX code for it to be safely freed.
Hack around the problem by just hiding the canvas for now.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6890 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/Src/Main.cpp | 7 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Src/Main.h | 1 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Src/SConscript | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp index bca9d8b252..4c074abcc4 100644 --- a/Source/Core/DolphinWX/Src/Main.cpp +++ b/Source/Core/DolphinWX/Src/Main.cpp @@ -96,7 +96,6 @@ bool DolphinApp::OnInit() // Declarations and definitions bool UseDebugger = false; - bool BatchMode = false; bool UseLogger = false; bool selectVideoPlugin = false; bool selectAudioPlugin = false; @@ -350,6 +349,9 @@ void DolphinApp::AfterInit(wxTimerEvent& WXUNUSED(event)) delete m_afterinit; m_afterinit = NULL; + if (!BatchMode) + main_frame->UpdateGameList(); + // First check if we have an exec command line. if (LoadFile && FileToLoad != wxEmptyString) { @@ -375,9 +377,6 @@ void DolphinApp::AfterInit(wxTimerEvent& WXUNUSED(event)) } } } - // No automatic start was requested; let the user make a selection. - else - main_frame->UpdateGameList(); } void DolphinApp::InitLanguageSupport() diff --git a/Source/Core/DolphinWX/Src/Main.h b/Source/Core/DolphinWX/Src/Main.h index ea44afac49..bffcaad86e 100644 --- a/Source/Core/DolphinWX/Src/Main.h +++ b/Source/Core/DolphinWX/Src/Main.h @@ -38,6 +38,7 @@ private: DECLARE_EVENT_TABLE() wxTimer *m_afterinit; + bool BatchMode; bool LoadFile; wxString FileToLoad; wxLocale *m_locale; diff --git a/Source/Core/DolphinWX/Src/SConscript b/Source/Core/DolphinWX/Src/SConscript index 8b9c2e05f0..595cf49fe9 100644 --- a/Source/Core/DolphinWX/Src/SConscript +++ b/Source/Core/DolphinWX/Src/SConscript @@ -61,6 +61,7 @@ if sys.platform == 'win32': files += [ "stdafx.cpp" ] elif sys.platform == 'darwin': ldflags += [ '-Wl,-pagezero_size,0x1000' ] + libs += [ 'iconv' ] exe = '#' + env['prefix'] + '/Dolphin.app/Contents/MacOS/Dolphin' if env['HAVE_WX']: |