From d2ff705af32862b4da49d213613233f93343874c Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 17 Dec 2021 16:00:04 +0000 Subject: [PATCH] patch 8.2.3837: QNX: crash when compiled with GUI but using terminal Problem: QNX: crash when compiled with GUI but using terminal. Solution: Check gui.in_use is set. (Hirohito Higashi, closes #9363) --- src/autocmd.c | 13 +++++++++---- src/version.c | 2 ++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/autocmd.c b/src/autocmd.c index 305679cf3..789dde1a2 100644 --- a/src/autocmd.c +++ b/src/autocmd.c @@ -1613,10 +1613,15 @@ win_found: #endif } #if defined(FEAT_GUI) - // Hide the scrollbars from the aucmd_win and update. - gui_mch_enable_scrollbar(&aucmd_win->w_scrollbars[SBAR_LEFT], FALSE); - gui_mch_enable_scrollbar(&aucmd_win->w_scrollbars[SBAR_RIGHT], FALSE); - gui_may_update_scrollbars(); + if (gui.in_use) + { + // Hide the scrollbars from the aucmd_win and update. + gui_mch_enable_scrollbar( + &aucmd_win->w_scrollbars[SBAR_LEFT], FALSE); + gui_mch_enable_scrollbar( + &aucmd_win->w_scrollbars[SBAR_RIGHT], FALSE); + gui_may_update_scrollbars(); + } #endif } else diff --git a/src/version.c b/src/version.c index 22f97ea21..aafa3d81d 100644 --- a/src/version.c +++ b/src/version.c @@ -749,6 +749,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 3837, /**/ 3836, /**/ -- 2.40.0