forks
/
dexed
mirror of https://gitlab.com/basile.b/dexed.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix, linux version, possible desktop cession crash when a runnable module was implicitly aborted

This commit is contained in:
Basile Burg 2015-10-22 00:36:47 +02:00
parent a262a8296f
commit ee4980204d
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ce_main.pas
View File

@ -990,8 +990,11 @@ begin
// //
fname := fRunProc.Executable; fname := fRunProc.Executable;
if getprocInputHandler.process = fRunProc then if getprocInputHandler.process = fRunProc then
begin
getMessageDisplay.message('the execution of a runnable module ' + getMessageDisplay.message('the execution of a runnable module ' +
'has been implicitly aborted', fDoc, amcEdit, amkWarn); 'has been implicitly aborted', fDoc, amcEdit, amkWarn);
getprocInputHandler.addProcess(nil);
end;
killProcess(fRunProc); killProcess(fRunProc);
if fileExists(fname) then if fileExists(fname) then
if ExtractFilePath(fname) = GetTempDir(false) then if ExtractFilePath(fname) = GetTempDir(false) then

3
src/ce_procinput.pas
View File

@ -82,7 +82,8 @@ begin
// TODO-cfeature: process list, imply that each TCESynMemo must have its own runnable TProcess // TODO-cfeature: process list, imply that each TCESynMemo must have its own runnable TProcess
// currently they share the CEMainForm.fRunProc variable. // currently they share the CEMainForm.fRunProc variable.
if fProc <> nil then if fProc <> nil then
fProc.Terminate(1); if fProc.Running then
fProc.Terminate(0);
txtExeName.Caption := 'no process'; txtExeName.Caption := 'no process';
fProc := nil; fProc := nil;