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

pcsx2: Remove useless plugin load failure error messages 

If wxDynamicLibrary.Load() fails, wxWidgets provides a good enough error
message anyway.
This commit is contained in:
Jonathan Li 2016-01-25 23:59:08 +00:00
parent 1d4e2cedf8
commit 2939abd8de
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pcsx2/gui/Panels/PluginSelectorPanel.cpp
View File

@ -98,7 +98,7 @@ public:
: m_plugpath( plugpath ) : m_plugpath( plugpath )
{ {
if( !m_plugin.Load( m_plugpath ) ) if( !m_plugin.Load( m_plugpath ) )
throw Exception::BadStream( m_plugpath ).SetBothMsgs(L"File is not a valid dynamic library."); throw Exception::BadStream();
wxDoNotLogInThisScope please; wxDoNotLogInThisScope please;
m_GetLibType = (_PS2EgetLibType)m_plugin.GetSymbol( L"PS2EgetLibType" ); m_GetLibType = (_PS2EgetLibType)m_plugin.GetSymbol( L"PS2EgetLibType" );
@ -721,11 +721,6 @@ void Panels::PluginSelectorPanel::OnProgress( wxCommandEvent& evt )
EnumeratedPluginInfo& result( m_EnumeratorThread->Results[evtidx] ); EnumeratedPluginInfo& result( m_EnumeratorThread->Results[evtidx] );
if( result.TypeMask == 0 )
{
Console.Error( L"Some kinda plugin failure: " + (*m_FileList)[evtidx] );
}
const PluginInfo* pi = tbl_PluginInfo; do const PluginInfo* pi = tbl_PluginInfo; do
{ {
const PluginsEnum_t pid = pi->id; const PluginsEnum_t pid = pi->id;
@ -785,9 +780,14 @@ void Panels::PluginSelectorPanel::EnumThread::DoNextPlugin( int curidx )
} }
} while( ++pi, pi->shortname != NULL ); } while( ++pi, pi->shortname != NULL );
} }
catch( Exception::BadStream& ex ) catch (Exception::NotEnumerablePlugin& ex)
{
Console.Warning(ex.FormatDiagnosticMessage());
}
// wx3.0 provides an error message if the library fails to load - we don't
// need to provide one ourselves
catch (Exception::BadStream&)
{ {
Console.Warning( ex.FormatDiagnosticMessage() );
} }
wxCommandEvent yay( pxEvt_EnumeratedNext ); wxCommandEvent yay( pxEvt_EnumeratedNext );