From 287bd773f82f7e027610f2b7086d5560f38fd103 Mon Sep 17 00:00:00 2001 From: cottonvibes Date: Sun, 24 Jan 2010 02:07:19 +0000 Subject: [PATCH] Fixed a compiler warning. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2504 96395faa-99c1-11dd-bbfe-3dabce05a288 --- pcsx2/gui/App.h | 2 +- pcsx2/gui/AppMain.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pcsx2/gui/App.h b/pcsx2/gui/App.h index d0a07af00d..06172741e3 100644 --- a/pcsx2/gui/App.h +++ b/pcsx2/gui/App.h @@ -482,7 +482,7 @@ public: void PostMenuAction( MenuIdentifiers menu_id ) const; int IssueDialogAsModal( const wxString& dlgName ); void PostMethod( FnPtr_AppMethod method ); - bool DoStuckThread( PersistentThread& stuck_thread ); + int DoStuckThread( PersistentThread& stuck_thread ); void SysExecute(); void SysExecute( CDVD_SourceType cdvdsrc, const wxString& elf_override=wxEmptyString ); diff --git a/pcsx2/gui/AppMain.cpp b/pcsx2/gui/AppMain.cpp index 10be073ef0..9afeaadfe0 100644 --- a/pcsx2/gui/AppMain.cpp +++ b/pcsx2/gui/AppMain.cpp @@ -320,7 +320,7 @@ void Pcsx2App::OnOpenDialog_StuckThread( wxCommandEvent& evt ) DoStuckThread( *(PersistentThread*)evt.GetClientData() ); } -bool Pcsx2App::DoStuckThread( PersistentThread& stuck_thread ) +int Pcsx2App::DoStuckThread( PersistentThread& stuck_thread ) { if( !wxThread::IsMain() ) {