mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-12-24 09:58:46 +00:00
Merge with develop
--HG-- branch : compatibility-develop
This commit is contained in:
commit
e7e8832130
3 changed files with 10 additions and 19 deletions
|
@ -777,8 +777,12 @@ bool launchProgram(const std::string &programName, const std::string &arguments,
|
||||||
|
|
||||||
int res = system(command.c_str());
|
int res = system(command.c_str());
|
||||||
|
|
||||||
if (res && log)
|
if (!res) return true;
|
||||||
|
|
||||||
|
if (log)
|
||||||
|
{
|
||||||
nlwarning ("LAUNCH: Failed launched '%s' with arg '%s' return code %d", programName.c_str(), arguments.c_str(), res);
|
nlwarning ("LAUNCH: Failed launched '%s' with arg '%s' return code %d", programName.c_str(), arguments.c_str(), res);
|
||||||
|
}
|
||||||
#else
|
#else
|
||||||
|
|
||||||
static bool firstLaunchProgram = true;
|
static bool firstLaunchProgram = true;
|
||||||
|
|
|
@ -43,7 +43,7 @@ int main(int argc, char *argv[])
|
||||||
NL3D::registerSerial3d();
|
NL3D::registerSerial3d();
|
||||||
|
|
||||||
sint res = 0;
|
sint res = 0;
|
||||||
|
|
||||||
for(uint i = 0; i < filePathes.size(); ++i)
|
for(uint i = 0; i < filePathes.size(); ++i)
|
||||||
{
|
{
|
||||||
std::string filePath = filePathes[i];
|
std::string filePath = filePathes[i];
|
||||||
|
@ -78,6 +78,8 @@ int main(int argc, char *argv[])
|
||||||
settings.ToolErrorLog = settings.DestinationDirectoryPath + "error.log";
|
settings.ToolErrorLog = settings.DestinationDirectoryPath + "error.log";
|
||||||
|
|
||||||
res = exportScene(settings);
|
res = exportScene(settings);
|
||||||
|
|
||||||
|
if (res != EXIT_SUCCESS) break;
|
||||||
}
|
}
|
||||||
|
|
||||||
return res;
|
return res;
|
||||||
|
|
|
@ -899,7 +899,7 @@ bool login()
|
||||||
Actions.enable(true);
|
Actions.enable(true);
|
||||||
EditActions.enable(true);
|
EditActions.enable(true);
|
||||||
|
|
||||||
if(ClientCfg.ConfigFile.exists("pPM->isVerboseLog()"))
|
if(ClientCfg.ConfigFile.exists("VerboseLog"))
|
||||||
pPM->setVerboseLog(ClientCfg.ConfigFile.getVar("VerboseLog").asInt() == 1);
|
pPM->setVerboseLog(ClientCfg.ConfigFile.getVar("VerboseLog").asInt() == 1);
|
||||||
if(pPM->isVerboseLog()) nlinfo("Using verbose log mode");
|
if(pPM->isVerboseLog()) nlinfo("Using verbose log mode");
|
||||||
|
|
||||||
|
@ -1848,25 +1848,10 @@ class CAHOpenURL : public IActionHandler
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
DWORD ret = 0;
|
|
||||||
LPVOID lpMsgBuf;
|
|
||||||
FormatMessage(
|
|
||||||
FORMAT_MESSAGE_ALLOCATE_BUFFER |
|
|
||||||
FORMAT_MESSAGE_FROM_SYSTEM |
|
|
||||||
FORMAT_MESSAGE_IGNORE_INSERTS,
|
|
||||||
NULL,
|
|
||||||
ret,
|
|
||||||
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
|
|
||||||
(LPTSTR) &lpMsgBuf,
|
|
||||||
0,
|
|
||||||
NULL
|
|
||||||
);
|
|
||||||
// Process any inserts in lpMsgBuf.
|
// Process any inserts in lpMsgBuf.
|
||||||
// ...
|
// ...
|
||||||
// Display the string.
|
// Display the string.
|
||||||
nlwarning("RegQueryValue for '%s' : %s", KeyName, lpMsgBuf);
|
nlwarning("RegQueryValue for '%s' : %s", KeyName, NLMISC::formatErrorMessage(0).c_str());
|
||||||
// Free the buffer.
|
|
||||||
LocalFree( lpMsgBuf );
|
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
// TODO: for Linux and Mac OS
|
// TODO: for Linux and Mac OS
|
||||||
|
|
Loading…
Reference in a new issue