devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 6 Actions Packages Projects 1 Releases Wiki Activity

Merge pull request #1324 from profanity-im/ui-fix

Browse Source 
Fix condition in wins_show_subwin()
This commit is contained in:
Michael Vetter
2020-04-23 11:12:27 +02:00
committed by GitHub
parent 4a712fcc7b 4672d0ca19
commit d572ffa061
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/ui/window.c
View File

@@ -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);

3
src/ui/window_list.c
View File

@@ -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;
}