From 5c1ce884dfec4fb361ea683ec818d6b4952bc841 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= Date: Wed, 20 Apr 2016 19:13:48 +0200 Subject: vis: handle termination from within win_open event gracefully --- sam.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'sam.c') diff --git a/sam.c b/sam.c index fd3009b..2e71239 100644 --- a/sam.c +++ b/sam.c @@ -768,16 +768,17 @@ enum SamError sam_cmd(Vis *vis, const char *s) { Filerange range = text_range_empty(); sam_execute(vis, vis->win, cmd, NULL, &range); - bool completed = true; - for (Cursor *c = view_cursors(vis->win->view); c; c = view_cursors_next(c)) { - Filerange sel = view_cursors_selection_get(c); - if (text_range_valid(&sel)) { - completed = false; - break; + if (vis->win) { + bool completed = true; + for (Cursor *c = view_cursors(vis->win->view); c; c = view_cursors_next(c)) { + Filerange sel = view_cursors_selection_get(c); + if (text_range_valid(&sel)) { + completed = false; + break; + } } + vis_mode_switch(vis, completed ? VIS_MODE_NORMAL : VIS_MODE_VISUAL); } - - vis_mode_switch(vis, completed ? VIS_MODE_NORMAL : VIS_MODE_VISUAL); command_free(cmd); return err; } @@ -950,7 +951,7 @@ static bool cmd_select(Vis *vis, Win *win, Command *cmd, const char *argv[], Cur break; } - if (view == vis->win->view && primary != view_cursors_primary_get(view)) + if (vis->win && vis->win->view == view && primary != view_cursors_primary_get(view)) view_cursors_primary_set(view_cursors(view)); return ret; } -- cgit v1.2.3