From 31fa064c683ae049fd392b8280e24aa14f0f4fa3 Mon Sep 17 00:00:00 2001
From: Jit Yao Yap <jityao@gmail.com>
Date: Fri, 22 Mar 2019 00:10:57 +0800
Subject: floating-window.c: fix crash when using inccommand

---
 src/nvim/window.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/nvim/window.c')

diff --git a/src/nvim/window.c b/src/nvim/window.c
index c25322c162..e1165e6ee9 100644
--- a/src/nvim/window.c
+++ b/src/nvim/window.c
@@ -2462,7 +2462,7 @@ int win_close(win_T *win, bool free_buf)
   }
 
   if (!was_floating) {
-    if (p_ea && (*p_ead == 'b' || *p_ead == dir)) {
+    if (!curwin->w_floating && p_ea && (*p_ead == 'b' || *p_ead == dir)) {
       // If the frame of the closed window contains the new current window,
       // only resize that frame.  Otherwise resize all windows.
       win_equal(curwin, curwin->w_frame->fr_parent == win_frame, dir);
@@ -4656,7 +4656,11 @@ void win_size_restore(garray_T *gap)
     {
       int i = 0;
       FOR_ALL_WINDOWS_IN_TAB(wp, curtab) {
-        frame_setwidth(wp->w_frame, ((int *)gap->ga_data)[i++]);
+        if (wp->w_floating) {
+          win_setwidth_win(((int *)gap->ga_data)[i++], wp);
+        } else {
+          frame_setwidth(wp->w_frame, ((int *)gap->ga_data)[i++]);
+        }
         win_setheight_win(((int *)gap->ga_data)[i++], wp);
       }
     }
-- 
cgit