(svn r17928) -Codechange: ShowErrorMessage() now takes the summary string before the details string.

Gentlemen, swap your string parameters.

2 files changed, 5 insertions, 5 deletions

diff --git a/src/network/network_content.cpp b/src/network/network_content.cpp
index 529ece802..5b2ce2258 100644
--- a/src/network/network_content.cpp
+++ b/src/network/network_content.cpp
@@ -382,7 +382,7 @@ DEF_CONTENT_RECEIVE_COMMAND(Client, PACKET_CONTENT_SERVER_CONTENT)
 			if (filename == NULL) {
 				/* Unless that fails ofcourse... */
 				DeleteWindowById(WC_NETWORK_STATUS_WINDOW, 0);
-				ShowErrorMessage(STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD, STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE, 0, 0);
+				ShowErrorMessage(STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE, STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD, 0, 0);
 				this->Close();
 				return false;
 			}
@@ -394,7 +394,7 @@ DEF_CONTENT_RECEIVE_COMMAND(Client, PACKET_CONTENT_SERVER_CONTENT)
 		size_t toRead = (size_t)(p->size - p->pos);
 		if (fwrite(p->buffer + p->pos, 1, toRead, this->curFile) != toRead) {
 			DeleteWindowById(WC_NETWORK_STATUS_WINDOW, 0);
-			ShowErrorMessage(STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD, STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE, 0, 0);
+			ShowErrorMessage(STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE, STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD, 0, 0);
 			this->Close();
 			fclose(this->curFile);
 			this->curFile = NULL;
@@ -417,7 +417,7 @@ DEF_CONTENT_RECEIVE_COMMAND(Client, PACKET_CONTENT_SERVER_CONTENT)
 
 				this->OnDownloadComplete(this->curInfo->id);
 			} else {
-				ShowErrorMessage(INVALID_STRING_ID, STR_CONTENT_ERROR_COULD_NOT_EXTRACT, 0, 0);
+				ShowErrorMessage(STR_CONTENT_ERROR_COULD_NOT_EXTRACT, INVALID_STRING_ID, 0, 0);
 			}
 		}
 	}
diff --git a/src/network/network_content_gui.cpp b/src/network/network_content_gui.cpp
index 80631f17f..2e07a7bc7 100644
--- a/src/network/network_content_gui.cpp
+++ b/src/network/network_content_gui.cpp
@@ -755,7 +755,7 @@ public:
 	virtual void OnConnect(bool success)
 	{
 		if (!success) {
-			ShowErrorMessage(INVALID_STRING_ID, STR_CONTENT_ERROR_COULD_NOT_CONNECT, 0, 0);
+			ShowErrorMessage(STR_CONTENT_ERROR_COULD_NOT_CONNECT, INVALID_STRING_ID, 0, 0);
 			delete this;
 		}
 
@@ -895,7 +895,7 @@ void ShowNetworkContentListWindow(ContentVector *cv, ContentType type)
 	DeleteWindowById(WC_NETWORK_WINDOW, 1);
 	new NetworkContentListWindow(&_network_content_list_desc, cv != NULL);
 #else
-	ShowErrorMessage(STR_CONTENT_NO_ZLIB_SUB, STR_CONTENT_NO_ZLIB, 0, 0);
+	ShowErrorMessage(STR_CONTENT_NO_ZLIB, STR_CONTENT_NO_ZLIB_SUB, 0, 0);
 	/* Connection failed... clean up the mess */
 	if (cv != NULL) {
 		for (ContentIterator iter = cv->Begin(); iter != cv->End(); iter++) delete *iter;