diff --git a/code/nel/src/misc/common.cpp b/code/nel/src/misc/common.cpp index 41a11976f..b40734b73 100644 --- a/code/nel/src/misc/common.cpp +++ b/code/nel/src/misc/common.cpp @@ -777,8 +777,12 @@ bool launchProgram(const std::string &programName, const std::string &arguments, 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); + } #else static bool firstLaunchProgram = true; diff --git a/code/nel/tools/3d/mesh_export/main.cpp b/code/nel/tools/3d/mesh_export/main.cpp index be19c92ff..f22e53f41 100644 --- a/code/nel/tools/3d/mesh_export/main.cpp +++ b/code/nel/tools/3d/mesh_export/main.cpp @@ -43,7 +43,7 @@ int main(int argc, char *argv[]) NL3D::registerSerial3d(); sint res = 0; - + for(uint i = 0; i < filePathes.size(); ++i) { std::string filePath = filePathes[i]; @@ -78,6 +78,8 @@ int main(int argc, char *argv[]) settings.ToolErrorLog = settings.DestinationDirectoryPath + "error.log"; res = exportScene(settings); + + if (res != EXIT_SUCCESS) break; } return res; diff --git a/code/ryzom/client/src/login.cpp b/code/ryzom/client/src/login.cpp index 43c00b18f..72d59e61f 100644 --- a/code/ryzom/client/src/login.cpp +++ b/code/ryzom/client/src/login.cpp @@ -899,7 +899,7 @@ bool login() Actions.enable(true); EditActions.enable(true); - if(ClientCfg.ConfigFile.exists("pPM->isVerboseLog()")) + if(ClientCfg.ConfigFile.exists("VerboseLog")) pPM->setVerboseLog(ClientCfg.ConfigFile.getVar("VerboseLog").asInt() == 1); if(pPM->isVerboseLog()) nlinfo("Using verbose log mode"); @@ -1848,25 +1848,10 @@ class CAHOpenURL : public IActionHandler } 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. // ... // Display the string. - nlwarning("RegQueryValue for '%s' : %s", KeyName, lpMsgBuf); - // Free the buffer. - LocalFree( lpMsgBuf ); + nlwarning("RegQueryValue for '%s' : %s", KeyName, NLMISC::formatErrorMessage(0).c_str()); } #else // TODO: for Linux and Mac OS