From 44b1e5126c355eb376a39f51652b44c174c1469d Mon Sep 17 00:00:00 2001
From: Michael Jennings <mej@kainx.org>
Date: Thu, 19 Jul 2001 19:20:23 +0000
Subject: [PATCH] Thu Jul 19 12:19:21 2001                        Michael
 Jennings (mej)

Minor fix to correct popup scrollbar handling on startup.


SVN revision: 4965
---
 ChangeLog     | 4 ++++
 src/startup.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 9e9a5bc..804d744 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4293,3 +4293,7 @@ Fri Jul 13 17:07:45 2001                        Michael Jennings (mej)
 This is mostly cosmetic, but fairly important nonetheless.  Saved
 config files should not contain the "main" context.
 ----------------------------------------------------------------------
+Thu Jul 19 12:19:21 2001                        Michael Jennings (mej)
+
+Minor fix to correct popup scrollbar handling on startup.
+----------------------------------------------------------------------
diff --git a/src/startup.c b/src/startup.c
index 68ad815..422ef7e 100644
--- a/src/startup.c
+++ b/src/startup.c
@@ -220,7 +220,7 @@ eterm_bootstrap(int argc, char *argv[])
 
   /* Initialize the scrollbar */
   scrollbar_init(szHint.width, szHint.height - bbar_calc_docked_height(BBAR_DOCKED));
-  scrollbar_mapping(Options & Opt_scrollbar);
+  scrollbar_mapping((Options & Opt_scrollbar) && !((Options & Opt_scrollbar_popup) && !TermWin.focus));
 
   /* Initialize the menu subsystem. */
   menu_init();