From 59b115d19702af75385aa6b658e59749baddcf8a Mon Sep 17 00:00:00 2001 From: John Peterson Date: Sat, 4 Oct 2008 14:26:47 +0000 Subject: [PATCH] Changed _SECURE_SCL from 1 to 0 in the debugger to allow me to access SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDSPPlugin.c_str() from there. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@765 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/DebuggerWX/DebuggerWX.vcproj | 2 +- Source/Core/DebuggerWX/Src/CodeWindow.cpp | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Source/Core/DebuggerWX/DebuggerWX.vcproj b/Source/Core/DebuggerWX/DebuggerWX.vcproj index 0d6c114a43..482f030357 100644 --- a/Source/Core/DebuggerWX/DebuggerWX.vcproj +++ b/Source/Core/DebuggerWX/DebuggerWX.vcproj @@ -245,7 +245,7 @@ Name="VCCLCompilerTool" WholeProgramOptimization="false" AdditionalIncludeDirectories="..\..\PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\Core\Src;..\Common\Src;..\..\..\Externals\Bochs_disasm" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__WXMSW__" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__WXMSW__;_SECURE_SCL=0" RuntimeLibrary="0" BufferSecurityCheck="false" UsePrecompiledHeader="0" diff --git a/Source/Core/DebuggerWX/Src/CodeWindow.cpp b/Source/Core/DebuggerWX/Src/CodeWindow.cpp index adf7a474d2..bad80afb2e 100644 --- a/Source/Core/DebuggerWX/Src/CodeWindow.cpp +++ b/Source/Core/DebuggerWX/Src/CodeWindow.cpp @@ -281,7 +281,7 @@ void CCodeWindow::CreateGUIControls(const SCoreStartupParameter& _LocalCoreStart m_JitWindow->Show(true); } - if(IsLoggingActivated() && bSoundWindow) + if(bSoundWindow) { // possible todo: add some kind of if here to? can it fail? CPluginManager::GetInstance().OpenDebug( @@ -332,9 +332,8 @@ void CCodeWindow::CreateMenu(const SCoreStartupParameter& _LocalCoreStartupParam wxMenuItem* pJit = pDebugDialogs->Append(IDM_JITWINDOW, _T("&Jit"), wxEmptyString, wxITEM_CHECK); pJit->Check(bJitWindow); - if (IsLoggingActivated()) { wxMenuItem* pSound = pDebugDialogs->Append(IDM_SOUNDWINDOW, _T("&Sound"), wxEmptyString, wxITEM_CHECK); - pSound->Check(bSoundWindow);} + pSound->Check(bSoundWindow); pMenuBar->Append(pDebugDialogs, _T("&Views")); } @@ -831,7 +830,7 @@ void CCodeWindow::OnToggleSoundWindow(wxCommandEvent& event) ini.Set("ShowOnStart", "SoundWindow", show); ini.Save("Debugger.ini"); - if (IsLoggingActivated() && show) + if (show) { // TODO: add some kind of if() check here to? CPluginManager::GetInstance().OpenDebug(