From 4672d0ca19e14e9af7c258cf3cf37b36655686da Mon Sep 17 00:00:00 2001 From: Dmitry Podgorny Date: Thu, 23 Apr 2020 14:30:49 +0300 Subject: ui: fix condition Fix mistake in a condition. Also add sanity check to win_refresh_with_subwin(). --- src/ui/window.c | 3 +++ src/ui/window_list.c | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/ui/window.c b/src/ui/window.c index 39e6500d..2ebf7a31 100644 --- a/src/ui/window.c +++ b/src/ui/window.c @@ -748,6 +748,9 @@ win_refresh_with_subwin(ProfWin *window) subwin_cols = win_occpuants_cols(); } else if (window->type == WIN_CONSOLE) { subwin_cols = win_roster_cols(); + } else { + // Other window types don't support subwindows, we shouldn't be here + return; } pnoutrefresh(layout->base.win, layout->base.y_pos, 0, row_start, 0, row_end, (cols-subwin_cols)-1); diff --git a/src/ui/window_list.c b/src/ui/window_list.c index 0c139cb7..b1c01c41 100644 --- a/src/ui/window_list.c +++ b/src/ui/window_list.c @@ -743,8 +743,7 @@ wins_show_subwin(ProfWin *window) win_show_subwin(window); // only mucwin and console have occupants/roster subwin - if (window->type != WIN_MUC || - window->type != WIN_CONSOLE) { + if (window->type != WIN_MUC && window->type != WIN_CONSOLE) { return; } -- cgit 1.4.1-2-gfad0