someone at MySQL...

... would have my balls for breakfast if he/she saw this ;-)

Fulfills rfe #383.
This commit is contained in:
rosenfield.albert
2009-03-04 12:15:11 +00:00
parent ff7eee92f3
commit 1f112b6556
9 changed files with 117 additions and 9 deletions

View File

@ -252,7 +252,16 @@ begin
if E.Message = SCanNotOpenResultSet then begin
Result := true;
FreeAndNil(ADataset);
end else AExceptionData := GetExceptionData(E);
end else if MainForm.cancelling then begin
AExceptionData := GetExceptionData(Exception.Create('Cancelled by user.'));
try
FMysqlConn.Reconnect;
finally
MainForm.cancelling := false;
end;
end else begin
AExceptionData := GetExceptionData(E);
end;
end;
end;
end;
@ -273,8 +282,18 @@ begin
q.DoAsyncExecSql();
Result := True;
except
On E: Exception do
AExceptionData := GetExceptionData(E);
On E: Exception do begin
if MainForm.cancelling then begin
AExceptionData := GetExceptionData(Exception.Create('Cancelled by user.'));
try
FMysqlConn.Reconnect;
finally
MainForm.cancelling := false;
end;
end else begin
AExceptionData := GetExceptionData(E);
end;
end;
end;
FreeAndNil (q);