From: <geo...@us...> - 2009-11-04 03:03:37
|
Revision: 3255 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=3255&view=rev Author: geoffthemedio Date: 2009-11-04 03:03:28 +0000 (Wed, 04 Nov 2009) Log Message: ----------- -Wrapped passed executable filenames in quotes so spaces in the filename don't cause them to be treated as to arguments when the server or AI is launched Modified Paths: -------------- trunk/FreeOrion/client/human/HumanClientApp.cpp trunk/FreeOrion/server/ServerApp.cpp Modified: trunk/FreeOrion/client/human/HumanClientApp.cpp =================================================================== --- trunk/FreeOrion/client/human/HumanClientApp.cpp 2009-11-01 18:15:30 UTC (rev 3254) +++ trunk/FreeOrion/client/human/HumanClientApp.cpp 2009-11-04 03:03:28 UTC (rev 3255) @@ -189,7 +189,8 @@ #else const std::string SERVER_CLIENT_EXE = (GetBinDir() / "freeoriond").file_string(); #endif - std::vector<std::string> args(1, SERVER_CLIENT_EXE); + std::vector<std::string> args; + args.push_back("\"" + SERVER_CLIENT_EXE + "\""); args.push_back("--resource-dir"); args.push_back("\"" + GetOptionsDB().Get<std::string>("resource-dir") + "\""); args.push_back("--log-level"); Modified: trunk/FreeOrion/server/ServerApp.cpp =================================================================== --- trunk/FreeOrion/server/ServerApp.cpp 2009-11-01 18:15:30 UTC (rev 3254) +++ trunk/FreeOrion/server/ServerApp.cpp 2009-11-04 03:03:28 UTC (rev 3255) @@ -149,7 +149,7 @@ std::string player_name = "AI_" + boost::lexical_cast<std::string>(ai_client_base_number + i); expected_ai_player_names.insert(player_name); std::vector<std::string> args; - args.push_back(AI_CLIENT_EXE); + args.push_back("\"" + AI_CLIENT_EXE + "\""); args.push_back(player_name); args.push_back("--resource-dir"); args.push_back("\"" + GetOptionsDB().Get<std::string>("resource-dir") + "\""); |