don't try restarting dcd after shutdownRequest, shutdown on exit

Pure-D · Apr 3, 2018 · 5be8531 · 5be8531
1 parent 9584d80
commit 5be8531
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/source/app.d b/source/app.d
@@ -106,6 +106,8 @@ void processNotify(RequestMessage msg)
 	if (msg.method == "exit" || served.extension.shutdownRequested)
 	{
 		rpc.stop();
+		if (!served.extension.shutdownRequested)
+			served.extension.shutdown();
 		return;
 	}
 	if (msg.method == "workspace/didChangeConfiguration")

diff --git a/source/served/extension.d b/source/served/extension.d
@@ -245,6 +245,8 @@ void handleBroadcast(JSONValue data)
 
 void startDCD()
 {
+	if (shutdownRequested)
+		return;
 	hasDCD = safe!(dcd.start)(workspaceRoot, config.d.dcdClientPath,
 			config.d.dcdServerPath, cast(ushort) 9166, false);
 	if (hasDCD)