From fa9fe1a67916a9332c78eaef894db344eb86b11f Mon Sep 17 00:00:00 2001
From: Derek Parker <parkerderek86@gmail.com>
Date: Sat, 25 Apr 2015 14:25:48 -0500
Subject: [PATCH] Improve RequestManualStop

---
 proctl/proctl.go      | 4 ++++
 proctl/proctl_test.go | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/proctl/proctl.go b/proctl/proctl.go
index d81b422f..410874c1 100644
--- a/proctl/proctl.go
+++ b/proctl/proctl.go
@@ -173,6 +173,10 @@ func (dbp *DebuggedProcess) RequestManualStop() error {
 	if err != nil {
 		return err
 	}
+	err = dbp.Halt()
+	if err != nil {
+		return err
+	}
 	dbp.running = false
 	return nil
 }
diff --git a/proctl/proctl_test.go b/proctl/proctl_test.go
index 9fad1c7a..49aa48b1 100644
--- a/proctl/proctl_test.go
+++ b/proctl/proctl_test.go
@@ -107,7 +107,7 @@ func TestHalt(t *testing.T) {
 		for _, th := range p.Threads {
 			_, err := th.Registers()
 			if err != nil {
-				t.Error(err)
+				t.Error(err, th.Id)
 			}
 		}
 	})