ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/public/ibx/trunk/runtime/nongui/IBCustomDataSet.pas
(Generate patch)

Comparing ibx/trunk/runtime/nongui/IBCustomDataSet.pas (file contents):
Revision 215 by tony, Thu Mar 15 16:25:03 2018 UTC vs.
Revision 221 by tony, Mon Mar 19 09:48:37 2018 UTC

# Line 51 | Line 51 | uses
51    Windows,
52   {$ENDIF}
53   {$IFDEF UNIX}
54 <  cthreads, unix,
54 >  unix,
55   {$ENDIF}
56    SysUtils, Classes, IBDatabase, IBExternals, IB,  IBSQL, Db,
57    IBUtils, IBBlob, IBSQLParser, IBDatabaseInfo, fpTimer;
# Line 1436 | Line 1436 | procedure TIBDataLink.SetDelayTimerValue
1436   begin
1437    if FDelayTimerValue = AValue then Exit;
1438    FDelayTimerValue := AValue;
1439 +  {$IF FPC_FULLVERSION >= 30002}
1440 +  if (AValue > 0) and not IsMultiThread then
1441 +    IBError(ibxeMultiThreadRequired,['TIBQuery/TIBDataset MasterDetailDelay']);
1442    FTimer.Interval := FDelayTimerValue;
1443 +  {$IFEND}
1444   end;
1445  
1446   procedure TIBDataLink.ActiveChanged;
# Line 1459 | Line 1463 | begin
1463      if FDelayTimerValue > 0 then
1464      with FTimer do
1465      begin
1466 +      CheckSynchronize; {Ensure not waiting on Synchronize}
1467        if Enabled then
1468        begin
1469          StopTimer;
# Line 5093 | Line 5098 | end;
5098   function TIBDataSetUpdateObject.GetRowsAffected(
5099    var SelectCount, InsertCount, UpdateCount, DeleteCount: integer): boolean;
5100   begin
5101 +  Result := true;
5102    SelectCount := 0;
5103    InsertCount := 0;
5104    UpdateCount := 0;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines