From f1ee62671e4188b3a56ca1ff2e84ab3da62b46bc Mon Sep 17 00:00:00 2001
From: Pavel Minaev <int19h@gmail.com>
Date: Mon, 8 Jan 2018 20:48:48 -0800
Subject: [PATCH] Fix more race conditions between initial configuration and
 code execution.

---
 ptvsd/wrapper.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ptvsd/wrapper.py b/ptvsd/wrapper.py
index 79ce677d..05157d55 100644
--- a/ptvsd/wrapper.py
+++ b/ptvsd/wrapper.py
@@ -253,23 +253,24 @@ class VSCodeMessageProcessor(ipcjson.SocketIO, ipcjson.IpcChannel):
         )
         self.send_event('initialized')
 
+    @async_handler
     def on_configurationDone(self, request, args):
         self.send_response(request)
+        yield self.pydevd_request(pydevd_comm.CMD_RUN, '')
+        self.send_process_event(self.start_reason)
 
     def on_disconnect(self, request, args):
         self.send_response(request)
 
     @async_handler
     def on_attach(self, request, args):
+        self.start_reason = 'attach'
         self.send_response(request)
-        yield self.pydevd_request(pydevd_comm.CMD_RUN, '')
-        self.send_process_event('attach')
 
     @async_handler
     def on_launch(self, request, args):
+        self.start_reason = 'launch'
         self.send_response(request)
-        yield self.pydevd_request(pydevd_comm.CMD_RUN, '')
-        self.send_process_event('launch')
 
     def send_process_event(self, start_method):
         evt = {