From 35c7d0a2ed6aab09519a03d2ada612d5c6b66ad4 Mon Sep 17 00:00:00 2001 From: Basile Burg Date: Mon, 11 May 2015 02:46:16 +0200 Subject: [PATCH] runnable module, always abort any previous runnable process --- src/ce_main.pas | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/ce_main.pas b/src/ce_main.pas index 464b745a..cbd63a8c 100644 --- a/src/ce_main.pas +++ b/src/ce_main.pas @@ -769,8 +769,9 @@ begin exit; // fname := fRunProc.Executable; - if ExtractFileDir(fname) <> GetTempDir(false) then - exit; + if getprocInputHandler.process = fRunProc then + getMessageDisplay.message('the execution of a runnable module ' + + 'has been implicitly aborted', fDoc, amcEdit, amkWarn); killProcess(fRunProc); if fileExists(fname) then sysutils.DeleteFile(fname); @@ -1359,6 +1360,7 @@ var fname: string; begin + fMsgs.clearByData(fDoc); FreeRunnableProc; if fDoc = nil then exit; @@ -1379,7 +1381,6 @@ begin dmdproc := TProcess.Create(nil); try - fMsgs.clearByData(fDoc); fMsgs.message('compiling ' + shortenPath(fDoc.fileName, 25), fDoc, amcEdit, amkInf); if fileExists(fDoc.fileName) then fDoc.save