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

(svn r15766) -Fix [FS#2744]: Crash when opening the content list window twice; inconsistencies when clicking download twice.

release/1.0
rubidium 2009-03-19 17:56:45 +00:00
parent 6dd04a9a78
commit f5cb1873d6
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/network/network_content_gui.cpp
View File

@ -95,7 +95,7 @@ public:
/* Yes... these are the NewGRF windows */ /* Yes... these are the NewGRF windows */
InvalidateWindowClasses(WC_SAVELOAD); InvalidateWindowClasses(WC_SAVELOAD);
InvalidateWindowData(WC_GAME_OPTIONS, 0, 1); InvalidateWindowData(WC_GAME_OPTIONS, 0, 1);
InvalidateWindowData(WC_NETWORK_WINDOW, 0, 2); InvalidateWindowData(WC_NETWORK_WINDOW, 1, 2);
break; break;
case CONTENT_TYPE_SCENARIO: case CONTENT_TYPE_SCENARIO:
@ -319,7 +319,7 @@ public:
* Create the content list window. * Create the content list window.
* @param desc the window description to pass to Window's constructor. * @param desc the window description to pass to Window's constructor.
*/ */
NetworkContentListWindow(const WindowDesc *desc, bool select_all) : QueryStringBaseWindow(EDITBOX_MAX_SIZE, desc), selected(NULL), list_pos(0) NetworkContentListWindow(const WindowDesc *desc, bool select_all) : QueryStringBaseWindow(EDITBOX_MAX_SIZE, desc, 1), selected(NULL), list_pos(0)
{ {
ttd_strlcpy(this->edit_str_buf, "", this->edit_str_size); ttd_strlcpy(this->edit_str_buf, "", this->edit_str_size);
this->afilter = CS_ALPHANUMERAL; this->afilter = CS_ALPHANUMERAL;
@ -383,7 +383,7 @@ public:
} }
} }
this->SetWidgetDisabledState(NCLWW_DOWNLOAD, filesize == 0); this->SetWidgetDisabledState(NCLWW_DOWNLOAD, filesize == 0 || FindWindowById(WC_NETWORK_STATUS_WINDOW, 0) != NULL);
this->SetWidgetDisabledState(NCLWW_UNSELECT, filesize == 0); this->SetWidgetDisabledState(NCLWW_UNSELECT, filesize == 0);
this->SetWidgetDisabledState(NCLWW_SELECT_ALL, !show_select_all); this->SetWidgetDisabledState(NCLWW_SELECT_ALL, !show_select_all);
this->SetWidgetDisabledState(NCLWW_SELECT_UPDATE, !show_select_upgrade); this->SetWidgetDisabledState(NCLWW_SELECT_UPDATE, !show_select_upgrade);
@ -594,7 +594,7 @@ public:
break; break;
case NCLWW_DOWNLOAD: case NCLWW_DOWNLOAD:
new NetworkContentDownloadStatusWindow(); if (BringWindowToFrontById(WC_NETWORK_STATUS_WINDOW, 0) == NULL) new NetworkContentDownloadStatusWindow();
break; break;
} }
} }
@ -782,6 +782,7 @@ void ShowNetworkContentListWindow(ContentVector *cv, ContentType type)
_network_content_client.RequestContentList(cv, true); _network_content_client.RequestContentList(cv, true);
} }
DeleteWindowById(WC_NETWORK_WINDOW, 1);
new NetworkContentListWindow(&_network_content_list_desc, cv != NULL); new NetworkContentListWindow(&_network_content_list_desc, cv != NULL);
#else #else
ShowErrorMessage(STR_CONTENT_NO_ZLIB_SUB, STR_CONTENT_NO_ZLIB, 0, 0); ShowErrorMessage(STR_CONTENT_NO_ZLIB_SUB, STR_CONTENT_NO_ZLIB, 0, 0);