X-Git-Url: http://git.lukelau.me/?p=lsp-test.git;a=blobdiff_plain;f=src%2FLanguage%2FHaskell%2FLSP%2FTest%2FSession.hs;h=9076a8e5e02e9ed819479a7d10c2f3a2d4ffc21a;hp=56e206d8bc8d1681cc4b5b3440fdae1a9b1db1c3;hb=133940df94b1e8745598699a492e5c9534644d75;hpb=280249dd3d7025f2e15ef6a9a6b5bfd22ce37447

diff --git a/src/Language/Haskell/LSP/Test/Session.hs b/src/Language/Haskell/LSP/Test/Session.hs
index 56e206d..9076a8e 100644
--- a/src/Language/Haskell/LSP/Test/Session.hs
+++ b/src/Language/Haskell/LSP/Test/Session.hs
@@ -267,7 +267,9 @@ runSessionWithHandles serverIn serverOut serverProc serverHandler config caps ro
       serverAndListenerFinalizer tid = do
         finally (timeout (messageTimeout config * 1^6)
                          (runSession' exitServer))
-                (cleanupProcess server >> killThread tid)
+                -- Make sure to kill the listener first, before closing
+                -- handles etc via cleanupProcess
+                (killThread tid >> cleanupProcess server)
 
   (result, _) <- bracket serverListenerLauncher
                          serverAndListenerFinalizer