diff options
| author | John Peterson <jpeterson57@gmail.com> | 2008-10-04 13:39:38 +0000 |
|---|---|---|
| committer | John Peterson <jpeterson57@gmail.com> | 2008-10-04 13:39:38 +0000 |
| commit | a7fa1410c292fd74ff02eb48694c70369554ab81 (patch) | |
| tree | f75e21b21ae0ee472fc57e4e5afaa97781e40171 /Source/Core | |
| parent | 580193658ab4922d46b0c91d6d1c8e49740ab929 (diff) | |
Moved a debugging check to the plugin from the main debugger. I still can't enable the sound plugin window in the Release build because I haven't figured out why calls to SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDSPPlugin.c_str() crashes in a Release build.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@764 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DebuggerWX/Src/CodeWindow.cpp | 56 |
1 files changed, 11 insertions, 45 deletions
diff --git a/Source/Core/DebuggerWX/Src/CodeWindow.cpp b/Source/Core/DebuggerWX/Src/CodeWindow.cpp index 6850bd29f3..adf7a474d2 100644 --- a/Source/Core/DebuggerWX/Src/CodeWindow.cpp +++ b/Source/Core/DebuggerWX/Src/CodeWindow.cpp @@ -283,26 +283,12 @@ void CCodeWindow::CreateGUIControls(const SCoreStartupParameter& _LocalCoreStart if(IsLoggingActivated() && bSoundWindow)
{
- if(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDSPPlugin.find("LLE") != -1)
- // no match = -1, in that case this is ignored
- {
- if (Core::GetState() != Core::CORE_UNINITIALIZED)
- {
- // possible todo: add some kind of if here to? can it fail?
- CPluginManager::GetInstance().OpenDebug(
- GetHandle(),
- SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDSPPlugin.c_str()
- );
- } // don't have any else, just ignore it
- }
- else
- {
- CPluginManager::GetInstance().OpenDebug(
- GetHandle(),
- SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDSPPlugin.c_str()
- );
- }
- }
+ // possible todo: add some kind of if here to? can it fail?
+ CPluginManager::GetInstance().OpenDebug(
+ GetHandle(),
+ SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDSPPlugin.c_str()
+ );
+ } // don't have any else, just ignore it
}
@@ -845,33 +831,13 @@ void CCodeWindow::OnToggleSoundWindow(wxCommandEvent& event) ini.Set("ShowOnStart", "SoundWindow", show);
ini.Save("Debugger.ini");
-
if (IsLoggingActivated() && show)
{
- // we only need to prevent this with the LLE, therefore this check
- if(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDSPPlugin.find("LLE") != -1)
- // no match = -1, in that case this is ignored
- {
- if (Core::GetState() != Core::CORE_UNINITIALIZED)
- {
- // TODO: add some kind of if here to?
- CPluginManager::GetInstance().OpenDebug(
- GetHandle(),
- SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDSPPlugin.c_str()
- );
- } else {
- event.Skip();
- wxMessageBox(_T("Please start the emulator before doing this."));
- }
- }
- else
- {
- CPluginManager::GetInstance().OpenDebug(
- GetHandle(),
- SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDSPPlugin.c_str()
- );
- }
-
+ // TODO: add some kind of if() check here to?
+ CPluginManager::GetInstance().OpenDebug(
+ GetHandle(),
+ SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDSPPlugin.c_str()
+ );
}
else // hide
{
|