diff options
| author | Glenn Rice <glennricster@gmail.com> | 2010-07-08 23:27:51 +0000 |
|---|---|---|
| committer | Glenn Rice <glennricster@gmail.com> | 2010-07-08 23:27:51 +0000 |
| commit | 07973f726ee1a7e1b6504e7a18e6d0de0c006ee4 (patch) | |
| tree | eea1a9a93f4d319bd09efd5da474f7721a1507ee /Source/Core/DebuggerWX | |
| parent | 543bb3ae4cd45d910b507ce70620f1dfac469173 (diff) | |
Fix a segfault when the debugger is used and dolphin exits.
Put the filename back into the "Saving settings ..." notice log (soren don't remove this again.)
Added a "batch" mode command line option. Now dolphin will not exit with the emulator if a file is run from the command line unless you also use the "batch" option. For example in linux "dolphin-emu -b -e filename".
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5859 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DebuggerWX')
| -rw-r--r-- | Source/Core/DebuggerWX/Src/CodeWindow.h | 2 | ||||
| -rw-r--r-- | Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Source/Core/DebuggerWX/Src/CodeWindow.h b/Source/Core/DebuggerWX/Src/CodeWindow.h index 11c79256e9..62834528a8 100644 --- a/Source/Core/DebuggerWX/Src/CodeWindow.h +++ b/Source/Core/DebuggerWX/Src/CodeWindow.h @@ -168,6 +168,8 @@ class CCodeWindow wxMenuItem* jitpoff; wxMenuItem* jitsroff; + std::string fontDesc; + CCodeView* codeview; wxListBox* callstack; wxListBox* symbols; diff --git a/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp b/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp index f8c1310aee..29e3d87554 100644 --- a/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp +++ b/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp @@ -87,7 +87,6 @@ void CCodeWindow::Load() ini.Load(File::GetUserPath(F_DEBUGGERCONFIG_IDX)); // The font to override DebuggerFont with - std::string fontDesc; ini.Get("ShowOnStart", "DebuggerFont", &fontDesc); if (!fontDesc.empty()) DebuggerFont.SetNativeFontInfoUserDesc(wxString::FromAscii(fontDesc.c_str())); @@ -135,7 +134,7 @@ void CCodeWindow::Save() IniFile ini; ini.Load(File::GetUserPath(F_DEBUGGERCONFIG_IDX)); - ini.Set("ShowOnStart", "DebuggerFont", std::string(DebuggerFont.GetNativeFontInfoUserDesc().mb_str())); + ini.Set("ShowOnStart", "DebuggerFont", fontDesc); // Boot to pause or not ini.Set("ShowOnStart", "AutomaticStart", GetMenuBar()->IsChecked(IDM_AUTOMATICSTART)); @@ -427,7 +426,10 @@ void CCodeWindow::OnChangeFont(wxCommandEvent& event) wxFontDialog dialog(this, data); if ( dialog.ShowModal() == wxID_OK ) + { DebuggerFont = dialog.GetFontData().GetChosenFont(); + fontDesc = std::string(DebuggerFont.GetNativeFontInfoUserDesc().mb_str()); + } } |