summaryrefslogtreecommitdiffstats
path: root/src/evalwindow.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-02-03 22:15:26 +0100
committerBram Moolenaar <Bram@vim.org>2020-02-03 22:15:26 +0100
commit631ebc48149a0446dd9ffbddd3e2822252085885 (patch)
treed98f3e6374369340184b20d42274c99951cb4aef /src/evalwindow.c
parente20b9ececa37a81c0340a78f61e57fa1bf46b06d (diff)
patch 8.2.0204: crash when using winnr('j') in a popup windowv8.2.0204
Problem: Crash when using winnr('j') in a popup window. Solution: Do not search for neighbors in a popup window. (closes #5568)
Diffstat (limited to 'src/evalwindow.c')
-rw-r--r--src/evalwindow.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/evalwindow.c b/src/evalwindow.c
index fb54033e5e..be6762a5c6 100644
--- a/src/evalwindow.c
+++ b/src/evalwindow.c
@@ -332,8 +332,6 @@ get_winnr(tabpage_T *tp, typval_T *argvar)
else if (STRCMP(arg, "#") == 0)
{
twin = (tp == curtab) ? prevwin : tp->tp_prevwin;
- if (twin == NULL)
- nr = 0;
}
else
{
@@ -360,6 +358,8 @@ get_winnr(tabpage_T *tp, typval_T *argvar)
else
invalid_arg = TRUE;
}
+ if (twin == NULL)
+ nr = 0;
if (invalid_arg)
{