/[pcsx2_0.9.7]/trunk/pcsx2/gui/AppCoreThread.cpp
ViewVC logotype

Diff of /trunk/pcsx2/gui/AppCoreThread.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

--- trunk/pcsx2/gui/AppCoreThread.cpp	2010/12/23 11:48:33	279
+++ trunk/pcsx2/gui/AppCoreThread.cpp	2010/12/23 12:02:12	280
@@ -109,6 +109,17 @@
 	_parent::Reset();
 }
 
+void AppCoreThread::ResetQuick()
+{
+	if( !GetSysExecutorThread().IsSelf() )
+	{
+		GetSysExecutorThread().PostEvent( SysExecEvent_InvokeCoreThreadMethod(&AppCoreThread::ResetQuick) );
+		return;
+	}
+
+	_parent::ResetQuick();
+}
+
 ExecutorThread& GetSysExecutorThread()
 {
 	return wxGetApp().SysExecutorThread;
@@ -183,7 +194,6 @@
 void AppCoreThread::OnResumeReady()
 {
 	wxGetApp().SysApplySettings();
-	wxGetApp().AllocateVM();
 	wxGetApp().PostMethod( AppSaveSettings );
 	_parent::OnResumeReady();
 }

 

  ViewVC Help
Powered by ViewVC 1.1.22