fix fvr client side deadlock and stack overflow

yatli · Mar 20, 2022 · a30912d · a30912d
1 parent a1d00c9
commit a30912d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/daemon.fs b/daemon.fs
@@ -190,7 +190,10 @@ let fvrConnect (stdin: Stream) (stdout: Stream) (verb: FVimRemoteVerb) =
     stdin.Write(intbuf, 0, intbuf.Length)
     stdin.Write(payload, 0, payload.Length)
     stdin.Flush()
-    (read stdout (intbuf.AsMemory())).Wait()
+    // this doesn't drive the task:
+    // (read stdout (intbuf.AsMemory())).Wait()
+    // this *does* drive the task:
+    read stdout (intbuf.AsMemory()) |> Async.AwaitTask |> Async.StartImmediate
     toInt32LE intbuf
   with ex ->
     trace "%O" ex

diff --git a/model.fs b/model.fs
@@ -627,11 +627,17 @@ let OnTerminated () =
     trace "terminating nvim..."
     nvim.stop 1
 
+let mutable _detaching = false
+
 let OnTerminating(args: CancelEventArgs) =
-    args.Cancel <- true
     trace "window is closing"
-    if nvim.isRemote then Detach()
-    else nvim.quitall() |> ignore
+    if nvim.isRemote then 
+        if not _detaching then
+            _detaching <- true
+            Detach()
+    else 
+        args.Cancel <- true
+        nvim.quitall() |> ignore
 
 let OnExtClosed(win: int) =
     nvim.call {method = "nvim_win_close"; parameters = mkparams2 win true}