See r37176. Let's keep this a Windows only "feature".

Something went wrong with a script while previewing a document and now
I have to wait for 30 minutes for quitting LyX without killing it.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38581 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Enrico Forestieri 2011-05-04 13:40:17 +00:00
parent b1fbf9c6a8
commit 0e6ee0227c
6 changed files with 26 additions and 2 deletions

View File

@ -225,8 +225,8 @@ int Systemcall::startscript(Starttype how, string const & what, bool process_eve
return 0;
}
int timeout_min = 30;
if (!d.waitWhile(SystemcallPrivate::Running, process_events, timeout_min * 60 * 1000)) {
if (!d.waitWhile(SystemcallPrivate::Running, process_events,
os::timeout_min() * 60 * 1000)) {
LYXERR0("Systemcall: '" << cmd << "' did not finish!");
LYXERR0("error " << d.errorMessage());
LYXERR0("status " << d.exitStatusMessage());

View File

@ -55,6 +55,9 @@ std::string current_root();
///
shell_type shell();
/// Returns no. of minutes allowed for a command to complete.
int timeout_min();
/// Name of the python interpreter
std::string const python();

View File

@ -381,6 +381,12 @@ shell_type shell()
}
int timeout_min()
{
return 3;
}
char path_separator()
{
return ':';

View File

@ -212,6 +212,12 @@ shell_type shell()
}
int timeout_min()
{
return 3;
}
char path_separator()
{
return ':';

View File

@ -423,6 +423,12 @@ shell_type shell()
}
int timeout_min()
{
return 30;
}
char path_separator()
{
return ';';

View File

@ -24,6 +24,9 @@ What's new
* DOCUMENT INPUT/OUTPUT
- Allow for a maximum of 3 minutes for the completion of a spawned command
except on Windows, were 30 minutes are allowed. This is bacause the Windows
installer may trigger MiKTeX updates that suffer from network latencies.
* USER INTERFACE