Author: soliton
Date: Mon Apr 27 15:52:28 2009
New Revision: 35260
URL: http://svn.gna.org/viewcvs/wesnoth?rev=35260&view=rev
Log:
remember the port when returning to the addon server
Modified:
trunk/src/addon_management.cpp
Modified: trunk/src/addon_management.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/addon_management.cpp?rev=35260&r1=35259&r2=35260&view=diff
==============================================================================
--- trunk/src/addon_management.cpp (original)
+++ trunk/src/addon_management.cpp Mon Apr 27 15:52:28 2009
@@ -870,11 +870,11 @@
msg_dlg.show();
}
- void download_addons(game_display& disp, std::string remote_host,
+ void download_addons(game_display& disp, const std::string&
remote_address,
bool update_mode, bool* do_refresh, int old_index = 0)
{
const std::vector<std::string> address_components =
- utils::split(remote_host, ':');
+ utils::split(remote_address, ':');
if(address_components.empty()) {
return;
}
@@ -882,8 +882,8 @@
const std::string old_host = preferences::campaign_server();
const int remote_port =
lexical_cast_default<int>(address_components.back(),
default_campaignd_port);
- remote_host = address_components.front();
- preferences::set_campaign_server(remote_host);
+ std::string remote_host = address_components.front();
+ preferences::set_campaign_server(remote_address);
try {
const network::manager net_manager;
@@ -1065,7 +1065,7 @@
uploads[index], versions[index],
net_manager, sock, do_refresh);
// Show the dialog again, and position it on the same
item installed
- download_addons(disp, remote_host, update_mode,
do_refresh, index);
+ download_addons(disp, remote_address, update_mode,
do_refresh, index);
} catch(config::error& e) {
ERR_CFG << "config::error thrown during transaction
with add-on server; \""<< e.message << "\"\n";
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
