Branch: refs/heads/document-messages Author: Nick Treleaven nick.treleaven@btinternet.com Committer: Nick Treleaven nick.treleaven@btinternet.com Date: Mon, 09 Jul 2012 12:31:04 Commit: 8d26450f07cac40812a04fe2adfd29fa54f25059 https://github.com/geany/geany/commit/8d26450f07cac40812a04fe2adfd29fa54f250...

Log Message: ----------- Add status bar warning if Windows spawn timed out

Modified Paths: -------------- src/win32.c

Modified: src/win32.c 9 files changed, 7 insertions(+), 2 deletions(-) =================================================================== @@ -1093,10 +1093,15 @@ static gboolean CreateChildProcess(geany_win32_spawn *gw_spawn, TCHAR *szCmdline else { gint i; + gsize ms = 30*1000;

- for (i = 0; i < 2 && WaitForSingleObject(piProcInfo.hProcess, 30*1000) == WAIT_TIMEOUT; i++) + /* FIXME: this seems to timeout when there are many lines + * to read - maybe because the child's pipe is full */ + for (i = 0; i < 2 && + WaitForSingleObject(piProcInfo.hProcess, ms) == WAIT_TIMEOUT; i++) { - geany_debug("CreateChildProcess: CreateProcess failed"); + ui_set_statusbar(FALSE, _("Process timed out after %.02f s!"), ms / 1000.0F); + geany_debug("CreateChildProcess: timed out"); TerminateProcess(piProcInfo.hProcess, WAIT_TIMEOUT); /* NOTE: This will not kill grandkids. */ }

@@ Diff output truncated at 100000 characters. @@

-------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).