[5592] info_get_or_remove_footnotes

[Gavin D. Smith]

Revision: 5592
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5592
Author:   gavin
Date:     2014-05-21 01:36:21 +0000 (Wed, 21 May 2014)
Log Message:
-----------
info_get_or_remove_footnotes

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/info/footnotes.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2014-05-21 00:59:25 UTC (rev 5591)
+++ trunk/ChangeLog     2014-05-21 01:36:21 UTC (rev 5592)
@@ -1,3 +1,8 @@
+2014-05-21  Gavin Smith  <address@hidden>
+
+       * info/footnotes.c (info_get_or_remove_footnotes): If window
+       too small to split to show footnotes window, don't crash.
+
 2014-05-20  Gavin Smith  <address@hidden>
 
        * info/window.c (window_initialize_windows): Use xzalloc to

Modified: trunk/info/footnotes.c
===================================================================
--- trunk/info/footnotes.c      2014-05-21 00:59:25 UTC (rev 5591)
+++ trunk/info/footnotes.c      2014-05-21 01:36:21 UTC (rev 5592)
@@ -229,11 +229,14 @@
       old_active = active_window;
       active_window = last;
       fn_win = window_make_window (new_footnotes);
-      fn_win->flags |= W_TempWindow;
-      active_window = old_active;
 
-      if (!fn_win)
+      if (fn_win)
         {
+          fn_win->flags |= W_TempWindow;
+          active_window = old_active;
+        }
+      else
+        {
           free (new_footnotes->contents);
           free (new_footnotes);