From 6394725ae84dd4d60626472104ef8bb8f352f4b3 Mon Sep 17 00:00:00 2001 From: tron Date: Sat, 4 Mar 2006 17:18:13 +0000 Subject: (svn r3761) Fix two bugs in r3757 --- news_gui.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'news_gui.c') diff --git a/news_gui.c b/news_gui.c index 4bbfe3e1b..941307daf 100644 --- a/news_gui.c +++ b/news_gui.c @@ -861,7 +861,7 @@ void DeleteVehicleNews(VehicleID vid, StringID news) { byte n; - for (n = _oldest_news; _latest_news != INVALID_NEWS && n != _latest_news + 1; n = (n + 1) % MAX_NEWS) { + for (n = _oldest_news; _latest_news != INVALID_NEWS && n != (_latest_news + 1) % MAX_NEWS; n = (n + 1) % MAX_NEWS) { const NewsItem* ni = &_news_items[n]; if (ni->flags & NF_VEHICLE && @@ -883,9 +883,10 @@ void DeleteVehicleNews(VehicleID vid, StringID news) _total_news--; w = FindWindowById(WC_MESSAGE_HISTORY, 0); - if (w == NULL) return; - SetWindowDirty(w); - w->vscroll.count = _total_news; + if (w != NULL) { + SetWindowDirty(w); + w->vscroll.count = _total_news; + } } } } -- cgit v1.2.3-54-g00ecf