ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Linux: IsRunning was crashing pcsx2. Also, jNO_DEFAULT isn't a good idea in these two spots. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1845 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2009-09-17 23:24:44 +00:00
parent 556a811933
commit 34af7c1281
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/Utilities/ThreadTools.cpp
View File

@ -165,6 +165,8 @@ namespace Threading
bool PersistentThread::IsRunning() const bool PersistentThread::IsRunning() const
{ {
if (!m_running) return false;
if( !!m_detached ) if( !!m_detached )
return !!m_running; return !!m_running;
else else

11
pcsx2/gui/Panels/SpeedhacksPanel.cpp
View File

@ -1,6 +1,6 @@
/* PCSX2 - PS2 Emulator for PCs /* PCSX2 - PS2 Emulator for PCs
* Copyright (C) 2002-2009 PCSX2 Dev Team * Copyright (C) 2002-2009 PCSX2 Dev Team
* *
* PCSX2 is free software: you can redistribute it and/or modify it under the terms * PCSX2 is free software: you can redistribute it and/or modify it under the terms
* of the GNU Lesser General Public License as published by the Free Software Found- * of the GNU Lesser General Public License as published by the Free Software Found-
* ation, either version 3 of the License, or (at your option) any later version. * ation, either version 3 of the License, or (at your option) any later version.
@ -47,7 +47,8 @@ const wxChar* Panels::SpeedHacksPanel::GetEEcycleSliderMsg( int val )
L"audio on many FMVs." L"audio on many FMVs."
); );
jNO_DEFAULT default:
break;
} }
return L"Unreachable Warning Suppressor!!"; return L"Unreachable Warning Suppressor!!";
@ -78,8 +79,8 @@ const wxChar* Panels::SpeedHacksPanel::GetVUcycleSliderMsg( int val )
L"3 - Maximum VU Cycle Stealing. Usefulness is limited, as this will cause flickering " L"3 - Maximum VU Cycle Stealing. Usefulness is limited, as this will cause flickering "
L"visuals or slowdown in most games." L"visuals or slowdown in most games."
); );
default:
jNO_DEFAULT break;
} }
return L"Unreachable Warning Suppressor!!"; return L"Unreachable Warning Suppressor!!";
@ -172,7 +173,7 @@ Panels::SpeedHacksPanel::SpeedHacksPanel( wxWindow& parent, int idealWidth ) :
L"Uses SSE's Min/Max Floating Point Operations instead of custom logical Min/Max routines. " L"Uses SSE's Min/Max Floating Point Operations instead of custom logical Min/Max routines. "
L"Known to break Gran Tourismo 4, Tekken 5." L"Known to break Gran Tourismo 4, Tekken 5."
) ); ) );
m_check_vuMinMax->SetValue(opts.vuMinMax); m_check_vuMinMax->SetValue(opts.vuMinMax);
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------