diff options
| author | letouzey | 2011-04-21 22:44:10 +0000 |
|---|---|---|
| committer | letouzey | 2011-04-21 22:44:10 +0000 |
| commit | 1b04c124152c47a664f2bee961e27293b1e2b2df (patch) | |
| tree | 72bb426dfcde111b2b7ae129d819b0487bd14ad4 /ide/command_windows.ml | |
| parent | 35de47646ff70782003dec969bfd4d7e3f9c2ac2 (diff) | |
Coqlib: avoid deadlock under win32 with force_reset_initial
The force_reset_initial starts by killing coqtop, then it tries
to acquire the lock on coq_computing. If it works, no jobs are
pending, we do the real reset_initial (launch of a new coqtop +
removal of buffer coloring) ourself.
Otherwise, the function do_if_not_computing is running, the death
of coqtop will raise a RestartCoqtop exception there, triggering
a reset_initial.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@14049 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'ide/command_windows.ml')
| -rw-r--r-- | ide/command_windows.ml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ide/command_windows.ml b/ide/command_windows.ml index d843f9ac51..506b572ffe 100644 --- a/ide/command_windows.ml +++ b/ide/command_windows.ml @@ -115,7 +115,7 @@ object(self) | Ide_intf.Good results -> ("Result for command " ^ phrase ^ ":\n" ^ results)) with e -> - let (_,s) = Coq.process_exn e in + let s = Printexc.to_string e in assert (Glib.Utf8.validate s); result#buffer#set_text s in |