mirror of https://github.com/PCSX2/pcsx2.git
wxgui: Test revision for Arcum -- with the plugin enumerator running in a single threaded model.
git-svn-id: http://pcsx2.googlecode.com/svn/branches/wxgui@1741 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
parent
9d65993ac5
commit
5728087dbb
|
@ -406,8 +406,6 @@ namespace Panels
|
|||
virtual ~EnumThread();
|
||||
EnumThread( PluginSelectorPanel& master );
|
||||
void Cancel();
|
||||
|
||||
protected:
|
||||
sptr ExecuteTask();
|
||||
};
|
||||
|
||||
|
|
|
@ -25,6 +25,9 @@
|
|||
#include <wx/dynlib.h>
|
||||
#include <wx/dir.h>
|
||||
|
||||
// Allows us to force-disable threading for debugging/troubleshooting
|
||||
static const bool DisableThreading = true;
|
||||
|
||||
using namespace wxHelpers;
|
||||
using namespace Threading;
|
||||
|
||||
|
@ -306,9 +309,17 @@ void Panels::PluginSelectorPanel::DoRefresh()
|
|||
// Use a thread to load plugins.
|
||||
safe_delete( m_EnumeratorThread );
|
||||
m_EnumeratorThread = new EnumThread( *this );
|
||||
m_EnumeratorThread->Start();
|
||||
|
||||
m_ComponentBoxes.Reset();
|
||||
if( DisableThreading )
|
||||
{
|
||||
m_ComponentBoxes.Reset();
|
||||
m_EnumeratorThread->ExecuteTask();
|
||||
}
|
||||
else
|
||||
{
|
||||
m_EnumeratorThread->Start();
|
||||
m_ComponentBoxes.Reset();
|
||||
}
|
||||
}
|
||||
|
||||
bool Panels::PluginSelectorPanel::ValidateEnumerationStatus()
|
||||
|
|
Loading…
Reference in New Issue