Fix disable toolbar for GNUStep.

* nsterm.m (updateFrameSize:): Only call update_frame_tool_bar
if toolbar is visible.

Fixes: debbugs:18345

diff --git a/src/ChangeLog b/src/ChangeLog
index d3874dbbadc422f545c85fa9656a99a3b9ee284d..0b58cdc1662fdd49d6f112416f44a9e7a4ab86f6 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2014-10-05  Jan Djärv  <jan.h.d@swipnet.se>
 
+       * nsterm.m (updateFrameSize:): Only call update_frame_tool_bar
+       if toolbar is visible.
+
        * nsfont.m (nsfont_draw): Use CGFloat for GNUstep newer than
        0.23 (Bug#18030).
 

diff --git a/src/nsterm.m b/src/nsterm.m
index ea8b4f726ff96f47aafbfaa307357006d4971453..b0a2994bcf57a6fb2d87bce0e0a12749daad242c 100644 (file)
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -5827,7 +5827,8 @@ not_in_argv (NSString *arg)
     {
 #ifdef NS_IMPL_GNUSTEP
       // GNUstep does not always update the tool bar height.  Force it.
-      if (toolbar) update_frame_tool_bar (emacsframe);
+      if (toolbar && [toolbar isVisible])
+          update_frame_tool_bar (emacsframe);
 #endif
 
       extra = FRAME_NS_TITLEBAR_HEIGHT (emacsframe)