Mercurial > hg > openttd

changeset 5533:33d8abf61800 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r7861) -Fix (r7823): Crash when oldest news was deleted. First check the index for oldest news and THEN decrease index, not the other way around.
author Darkvater <Darkvater@openttd.org>
date Fri, 05 Jan 2007 11:41:11 +0000
parents c02003f835f5
children 8df467223829
files src/news_gui.c
diffstat 1 files changed, 3 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/news_gui.c
+++ b/src/news_gui.c
@@ -912,17 +912,15 @@
 				w = FindWindowById(WC_NEWS_WINDOW, 0);
 				visible_news = (w != NULL) ? (NewsID)(WP(w, news_d).ni - _news_items) : INVALID_NEWS;
 
-				i = n;
-				do {
+				for (i = n;; i = decreaseIndex(i)) {
 					_news_items[i] = _news_items[decreaseIndex(i)];
 
 					if (i == _current_news) _current_news = increaseIndex(_current_news);
 					if (i == _forced_news) _forced_news = increaseIndex(_forced_news);
 					if (i == visible_news) WP(w, news_d).ni = &_news_items[increaseIndex(visible_news)];
 
-					i = decreaseIndex(i);
-				} while (i != _oldest_news);
-
+					if (i == _oldest_news) break;
+				}
 				_oldest_news = increaseIndex(_oldest_news);
 			}