diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:14:37 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:14:37 +0200 |
| commit | 8bf668665b107469086f16cb8ad23e47d479d2b4 (patch) | |
| tree | 66a91ef06a8caa7cd6819dcbe1860693d3eda8d5 /shared/shell_execute.h | |
| parent | 3.21 (diff) | |
| download | FreeFileSync-8bf668665b107469086f16cb8ad23e47d479d2b4.tar.gz FreeFileSync-8bf668665b107469086f16cb8ad23e47d479d2b4.tar.bz2 FreeFileSync-8bf668665b107469086f16cb8ad23e47d479d2b4.zip | |
4.0
Diffstat (limited to 'shared/shell_execute.h')
| -rw-r--r-- | shared/shell_execute.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/shared/shell_execute.h b/shared/shell_execute.h index 64797eff..a127ee06 100644 --- a/shared/shell_execute.h +++ b/shared/shell_execute.h @@ -69,7 +69,7 @@ void shellExecute(const wxString& command, ExecutionType type = EXEC_TYPE_ASYNC) if (!::ShellExecuteEx(&execInfo)) //__inout LPSHELLEXECUTEINFO lpExecInfo { - wxString errorMsg = _("Invalid commandline: %x"); + wxString errorMsg = _("Invalid command line: %x"); wxString cmdFmt = wxString(L"\nFile: ") + filename + L"\nArg: " + arguments; errorMsg.Replace(L"%x", cmdFmt); @@ -92,7 +92,7 @@ void shellExecute(const wxString& command, ExecutionType type = EXEC_TYPE_ASYNC) int rv = ::system(utf8CvrtTo<std::string>(command).c_str()); //do NOT use std::system as its documentation says nothing about "WEXITSTATUS(rv)", ect... if (rv == -1 || WEXITSTATUS(rv) == 127) //http://linux.die.net/man/3/system "In case /bin/sh could not be executed, the exit status will be that of a command that does exit(127)" { - wxString errorMsg = _("Invalid commandline: %x"); + wxString errorMsg = _("Invalid command line: %x"); replace(errorMsg, L"%x", L"\n" + command); wxMessageBox(errorMsg); return; @@ -100,7 +100,7 @@ void shellExecute(const wxString& command, ExecutionType type = EXEC_TYPE_ASYNC) } else { - // ! unfortunately it seems there is no way on Linux to get a failure notification for calling an invalid commandline asynchronously ! + // ! unfortunately it seems there is no way on Linux to get a failure notification for calling an invalid command line asynchronously ! //by default wxExecute uses a zero sized dummy window as a hack to keep focus which leaves a useless empty icon in ALT-TAB list //=> use wxEXEC_NODISABLE and roll our own window disabler! (see comment in app.cpp: void *wxGUIAppTraits::BeforeChildWaitLoop()) |