diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f01a025e6e..358dc6787c 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,6 +1,12 @@
 2007-12-02  Pierre Muller  <muller@ics.u-strasbg.fr>
 
-	*win32-nat.c (open_process_used): New static variable.
+	* win32-nat.c (win32_resume): Set the trace bit
+	in the thread identified by inferior_ptid.
+
+
+2007-12-02  Pierre Muller  <muller@ics.u-strasbg.fr>
+
+	* win32-nat.c (open_process_used): New static variable.
 	(win32_init_thread_list): Remove call to CloseHandle for thread.
 	(win32_delete_thread): Ditto.
 	(fake_create_process): Set open_process_used if OpenProcess call is
diff --git a/gdb/win32-nat.c b/gdb/win32-nat.c
index c6250519a5..f389a0fbd9 100644
--- a/gdb/win32-nat.c
+++ b/gdb/win32-nat.c
@@ -1232,7 +1232,7 @@ win32_resume (ptid_t ptid, int step, enum target_signal sig)
 	       pid, step, sig));
 
   /* Get context for currently selected thread */
-  th = thread_rec (current_event.dwThreadId, FALSE);
+  th = thread_rec (PIDGET (inferior_ptid), FALSE);
   if (th)
     {
       if (step)
diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index c6250519a5..f389a0fbd9 100644
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -1232,7 +1232,7 @@ win32_resume (ptid_t ptid, int step, enum target_signal sig)
 	       pid, step, sig));
 
   /* Get context for currently selected thread */
-  th = thread_rec (current_event.dwThreadId, FALSE);
+  th = thread_rec (PIDGET (inferior_ptid), FALSE);
   if (th)
     {
       if (step)