Browse Source

avoid crash on Qt5

Johann ELSASS 2 years ago
parent
commit
d73455025d
2 changed files with 2 additions and 0 deletions
  1. 1 0
      lazpaint/lazpaintinstance.pas
  2. 1 0
      lazpaint/lazpaintmainform.pas

+ 1 - 0
lazpaint/lazpaintinstance.pas

@@ -374,6 +374,7 @@ procedure TLazPaintInstance.ReportActionProgress(AProgressPercent: integer);
 var
 var
   delay: Integer;
   delay: Integer;
 begin
 begin
+  {$IFDEF LCLqt5}exit;{$ENDIF}
   if AProgressPercent < 100 then delay := 10000 else delay := 1000;
   if AProgressPercent < 100 then delay := 10000 else delay := 1000;
   if Assigned(FMain) then FMain.UpdatingPopup:= true;
   if Assigned(FMain) then FMain.UpdatingPopup:= true;
   try
   try

+ 1 - 0
lazpaint/lazpaintmainform.pas

@@ -2695,6 +2695,7 @@ end;
 
 
 procedure TFMain.TimerUpdateTimer(Sender: TObject);
 procedure TFMain.TimerUpdateTimer(Sender: TObject);
 begin
 begin
+  if FLazPaintInstance = nil then exit;
   TimerUpdate.Enabled := false;
   TimerUpdate.Enabled := false;
   if ToolManager.ToolSleeping and not spacePressed and
   if ToolManager.ToolSleeping and not spacePressed and
      ([ssLeft,ssRight,ssMiddle] * FLayout.MouseButtonState = []) then
      ([ssLeft,ssRight,ssMiddle] * FLayout.MouseButtonState = []) then