Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: Use "open" to open other programs too under OS X

Browse source
This commit is contained in:
kervala 2016-02-02 19:20:34 +01:00
parent 2274cfff89
commit e9a39a9a55
1 changed files with 5 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
code/nel/src/misc/common.cpp
View file

@ -753,25 +753,13 @@ bool launchProgram(const std::string &programName, const std::string &arguments,
} }
#elif defined(NL_OS_MAC) #elif defined(NL_OS_MAC)
std::string command; // we need to open bundles with "open" command
std::string command = NLMISC::toString("open \"%s\"", programName.c_str());
if (CFile::getExtension(programName) == "app") // append arguments if any
if (!arguments.empty())
{ {
// we need to open bundles with "open" command command += NLMISC::toString(" --args %s", arguments.c_str());
command = NLMISC::toString("open \"%s\"", programName.c_str());
// append arguments if any
if (!arguments.empty())
{
command += NLMISC::toString(" --args %s", arguments.c_str());
}
}
else
{
command = programName;
// append arguments if any
if (!arguments.empty()) command += " " + arguments;
} }
int res = system(command.c_str()); int res = system(command.c_str());