From 8f9ea31a87e74f4b595d21bf633859205e1a0ec1 Mon Sep 17 00:00:00 2001
From: "Unknown W. Brackets" <checkins@unknownbrackets.org>
Date: Sat, 23 Feb 2013 13:54:47 -0800
Subject: [PATCH] Don't bother resuming/pausing around savestates.

Only makes things more likely to crash.
---
 Qt/mainwindow.cpp         | 40 ---------------------------------------
 Windows/WndMainWindow.cpp |  7 -------
 2 files changed, 47 deletions(-)

diff --git a/Qt/mainwindow.cpp b/Qt/mainwindow.cpp
index 9c74aad706..7304c06cbf 100644
--- a/Qt/mainwindow.cpp
+++ b/Qt/mainwindow.cpp
@@ -388,26 +388,10 @@ void SaveStateActionFinished(bool result, void *userdata)
 		msgBox.exec();
 		return;
 	}
-
-	MainWindow* mainWindow = (MainWindow*)userdata;
-
-	if (g_State.bEmuThreadStarted && mainWindow->GetNextState() == CORE_RUNNING)
-	{
-		if(mainWindow->GetDialogDisasm())
-			mainWindow->GetDialogDisasm()->Go();
-	}
 }
 
 void MainWindow::on_action_FileLoadStateFile_triggered()
 {
-	if (g_State.bEmuThreadStarted)
-	{
-		nextState = Core_IsStepping() ? CORE_STEPPING : CORE_RUNNING;
-		if(dialogDisasm)
-		{
-			dialogDisasm->Stop();
-		}
-	}
 	QFileDialog dialog(0,"Load state");
 	dialog.setFileMode(QFileDialog::ExistingFile);
 	QStringList filters;
@@ -425,14 +409,6 @@ void MainWindow::on_action_FileLoadStateFile_triggered()
 
 void MainWindow::on_action_FileSaveStateFile_triggered()
 {
-	if (g_State.bEmuThreadStarted)
-	{
-		nextState = Core_IsStepping() ? CORE_STEPPING : CORE_RUNNING;
-		if(dialogDisasm)
-		{
-			dialogDisasm->Stop();
-		}
-	}
 	QFileDialog dialog(0,"Save state");
 	dialog.setFileMode(QFileDialog::AnyFile);
 	dialog.setAcceptMode(QFileDialog::AcceptSave);
@@ -449,27 +425,11 @@ void MainWindow::on_action_FileSaveStateFile_triggered()
 
 void MainWindow::on_action_FileQuickloadState_triggered()
 {
-	if (g_State.bEmuThreadStarted)
-	{
-		nextState = Core_IsStepping() ? CORE_STEPPING : CORE_RUNNING;
-		if(dialogDisasm)
-		{
-			dialogDisasm->Stop();
-		}
-	}
 	SaveState::LoadSlot(0, SaveStateActionFinished, this);
 }
 
 void MainWindow::on_action_FileQuickSaveState_triggered()
 {
-	if (g_State.bEmuThreadStarted)
-	{
-		nextState = Core_IsStepping() ? CORE_STEPPING : CORE_RUNNING;
-		if(dialogDisasm)
-		{
-			dialogDisasm->Stop();
-		}
-	}
 	SaveState::SaveSlot(0, SaveStateActionFinished, this);
 }
 
diff --git a/Windows/WndMainWindow.cpp b/Windows/WndMainWindow.cpp
index d8c35701ef..2a233ff034 100644
--- a/Windows/WndMainWindow.cpp
+++ b/Windows/WndMainWindow.cpp
@@ -869,13 +869,6 @@ namespace MainWindow
 		if (!result)
 			MessageBox(0, "Savestate failure.  Please try again later.", "Sorry", MB_OK);
 		SetCursor(LoadCursor(0, IDC_ARROW));
-
-		if (g_State.bEmuThreadStarted && nextState == CORE_RUNNING)
-		{
-			for (int i=0; i<numCPUs; i++)
-				if (disasmWindow[i])
-					SendMessage(disasmWindow[i]->GetDlgHandle(), WM_COMMAND, IDC_GO, 0);
-		}
 	}
 
 	void SetNextState(CoreState state)