mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r21458) -Fix [FS#4180]: possible crash when news item gets removed at just the wrong moment

release/1.1
rubidium 2010-12-10 22:39:01 +00:00
parent 8faa97c060
commit 676a53fb40
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/news_gui.cpp
View File

@ -722,14 +722,7 @@ void AddNewsItem(StringID string, NewsSubtype subtype, NewsReferenceType reftype
/** Delete a news item from the queue */ /** Delete a news item from the queue */
static void DeleteNewsItem(NewsItem *ni) static void DeleteNewsItem(NewsItem *ni)
{ {
if (_forced_news == ni || _current_news == ni) { /* Delete the news from the news queue. */
/* about to remove the currently forced item (shown as newspapers) ||
* about to remove the currently displayed item (newspapers, ticker, or just a reminder) */
MoveToNextItem();
}
/* delete item */
if (ni->prev != NULL) { if (ni->prev != NULL) {
ni->prev->next = ni->next; ni->prev->next = ni->next;
} else { } else {
@ -744,8 +737,18 @@ static void DeleteNewsItem(NewsItem *ni)
_latest_news = ni->prev; _latest_news = ni->prev;
} }
if (_current_news == ni) _current_news = ni->prev;
_total_news--; _total_news--;
if (_forced_news == ni || _current_news == ni || _statusbar_news_item == ni) {
/* When we're the current news, go to the previous item first;
* we just possibly made that the last news item. */
if (_current_news == ni) _current_news = ni->prev;
/* About to remove the currently forced item (shown as newspapers) ||
* about to remove the currently displayed item (newspapers, ticker, or just a reminder) */
MoveToNextItem();
}
delete ni; delete ni;
SetWindowDirty(WC_MESSAGE_HISTORY, 0); SetWindowDirty(WC_MESSAGE_HISTORY, 0);