From 880037447664511bf430050d6709a30bec728437 Mon Sep 17 00:00:00 2001
From: Li Haoyi <haoyi.sg@gmail.com>
Date: Sat, 24 Feb 2018 21:03:58 -0800
Subject: Fix `-w` using the new client-server mode

---
 clientserver/src/mill/clientserver/Server.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'clientserver')

diff --git a/clientserver/src/mill/clientserver/Server.scala b/clientserver/src/mill/clientserver/Server.scala
index de8097fb..2b8ad39f 100644
--- a/clientserver/src/mill/clientserver/Server.scala
+++ b/clientserver/src/mill/clientserver/Server.scala
@@ -19,7 +19,6 @@ trait ServerMain[T]{
   def main0(args: Array[String],
             stateCache: Option[T],
             mainInteractive: Boolean,
-            watchInterrupted: () => Boolean,
             stdin: InputStream,
             stdout: PrintStream,
             stderr: PrintStream): (Boolean, Option[T])
@@ -73,7 +72,6 @@ class Server[T](lockBase: String,
           args,
           sm.stateCache,
           interactive,
-          () => !locks.clientLock.probe(),
           socketIn,
           stdout, stderr
         )
@@ -98,6 +96,8 @@ class Server[T](lockBase: String,
       Thread.sleep(3)
     }
 
+    if (!done) interruptServer()
+
     t.interrupt()
     t.stop()
     clientSocket.close()
-- 
cgit v1.2.3