From 3807e914e8c347391d534ffe7661569a3051a7e9 Mon Sep 17 00:00:00 2001 From: Darkvater Date: Wed, 6 Dec 2006 17:28:14 +0000 Subject: [PATCH] (svn r7402) -Fix: [FS#255] Long Delay for Message Windows to Appear. Immediately show a new message if present if no news window is open, or has just been closed instead of waiting for the timer of the current news to time out. --- news_gui.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/news_gui.c b/news_gui.c index 05804d9c83..7400ac1e4f 100644 --- a/news_gui.c +++ b/news_gui.c @@ -471,15 +471,11 @@ static bool ReadyForNextItem(void) w = FindWindowById(WC_STATUS_BAR, 0); if (w != NULL && WP(w, const def_d).data_1 > -1280) return false; - // Newspaper message - // Wait until duration reaches 0 - if (ni->duration != 0) { - ni->duration--; - return false; - } + // Newspaper message, decrement duration counter + if (ni->duration != 0) ni->duration--; // neither newsticker nor newspaper are running - return true; + return (ni->duration == 0 || FindWindowById(WC_NEWS_WINDOW, 0) == NULL); } static void MoveToNextItem(void)