Angus's fd_form_title patch and my cleanup of it

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1100 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index 6581ddbfee55ad5249ab55028b8f62e6ed177e22..d931106b535ef73bb6dbc2f73727e94ca1174301 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-10-11  Allan Rae  <rae@lyx.org>
+
+       * src/lyx_cb.C (TimerCB): cleaned up Angus's patch.
+
+2000-10-10  Angus Leeming <a.leeming@ic.ac.uk>
+
+       * src/lyx_cb.C (TimerCB): fix crash when fd_form_title doesn't exist.
+
 2000-10-10  Allan Rae <rae@lyx.org>
 
        * src/lyxrc.[Ch]:

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index 7e9cbb003a92697a8f314c7341ee043e04c41915..2433f49267471a1da13bc539f53af38a214ebc8b 100644 (file)
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -748,7 +748,9 @@ LyXFont const UserFreeFont(BufferParams const & params)
 extern "C" void TimerCB(FL_OBJECT *, long)
 {
        // only if the form still exists
-       if (lyxrc.show_banner && fd_form_title->form_title != 0) {
+       if (lyxrc.show_banner
+           && fd_form_title
+           && fd_form_title->form_title) {
                if (fd_form_title->form_title->visible) {
                        fl_hide_form(fd_form_title->form_title);
                }