From 8bf8c7e6e912648c7e0accf891758af362be9984 Mon Sep 17 00:00:00 2001
From: Peter Tissen <dravorek@gmail.com>
Date: Fri, 14 Feb 2014 18:14:14 +0100
Subject: [PATCH] undo thread behavior changes and add html subproject to
 dependencies.

---
 rpcs3.sln                   |  1 +
 rpcs3/Emu/CPU/CPUThread.cpp | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/rpcs3.sln b/rpcs3.sln
index d17e99fae9..6074f13ecc 100644
--- a/rpcs3.sln
+++ b/rpcs3.sln
@@ -10,6 +10,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rpcs3", "rpcs3\rpcs3.vcxpro
 		{23E1C437-A951-5943-8639-A17F3CF2E606} = {23E1C437-A951-5943-8639-A17F3CF2E606}
 		{22B14659-C5B6-B775-868D-A49198FEAD4A} = {22B14659-C5B6-B775-868D-A49198FEAD4A}
 		{9ED1866B-D4AE-3440-24E4-7A9475B163B2} = {9ED1866B-D4AE-3440-24E4-7A9475B163B2}
+		{6EDC3B79-D217-F11A-406F-F11D856493F9} = {6EDC3B79-D217-F11A-406F-F11D856493F9}
 		{3111D679-7796-23C4-BA0C-271F1145DA24} = {3111D679-7796-23C4-BA0C-271F1145DA24}
 		{AFF2C68B-B867-DD50-6AC5-74B09D41F8EA} = {AFF2C68B-B867-DD50-6AC5-74B09D41F8EA}
 		{FAF0CB93-F7CE-A6B8-8342-19CE99BAF774} = {FAF0CB93-F7CE-A6B8-8342-19CE99BAF774}
diff --git a/rpcs3/Emu/CPU/CPUThread.cpp b/rpcs3/Emu/CPU/CPUThread.cpp
index 1e881bcd91..8942295a46 100644
--- a/rpcs3/Emu/CPU/CPUThread.cpp
+++ b/rpcs3/Emu/CPU/CPUThread.cpp
@@ -96,21 +96,21 @@ bool CPUThread::Sync()
 
 int CPUThread::ThreadStatus()
 {
-	if(Emu.IsStopped() || IsStopped() )
+	if(Emu.IsStopped() || IsStopped() || IsPaused())
 	{
 		return CPUThread_Stopped;
 	}
 
-	if (m_is_step)
-	{
-		return CPUThread_Step;
-	}
-
-	if (TestDestroy())
+	if(TestDestroy())
 	{
 		return CPUThread_Break;
 	}
 
+	if(m_is_step)
+	{
+		return CPUThread_Step;
+	}
+
 	if(Emu.IsPaused() || Sync())
 	{
 		return CPUThread_Sleeping;