Changeset 374 for trunk

Timestamp:

Apr 23, 2021, 1:48:45 PM (4 years ago)

Author:

chronos

Message:

• Fixed: Still possible crash during change of partialy produced project in city screen.

Location:

trunk

Files:

• Direct.pas (modified) (3 diffs)
• LocalPlayer/CityScreen.pas (modified) (1 diff)
• Packages/CevoComponents/ScreenTools.pas (modified) (2 diffs)

trunk/Direct.pas

@@ -58 +58 @@
 //  p: pointer;
   s: string;
-begin
+Begin
   case ID of
     ntInitLocalHuman: begin
@@ -65 +65 @@
       Info := Phrases.Lookup('BUSY_MODLH');
       Show;
-      {$IFDEF LINUX}
-      // Force shown window repaint on Gtk2 widgetset
-      Sleep(1);
-      Application.ProcessMessages;
-      {$ENDIF}
+      Gtk2Fix;
       Invalidate;
       Update;
@@ -198 +194 @@
 
 procedure TDirectDlg.FormShow(Sender: TObject);
+var
+  I: Integer;
 begin
   if not Gone then

trunk/LocalPlayer/CityScreen.pas

@@ -1492 +1492 @@
             (cpImp or cpIndex) then
           begin // loss of material -- do query
-            Application.ProcessMessages; // TODO: Needed for Gtk2, Lazarus gtk2 bug?
+            Gtk2Fix;
             if (pt1 = ptTrGoods) or (pt1 = ptShip) or (pt1 <> pt0) and
               (pt0 <> ptCaravan) then begin

trunk/Packages/CevoComponents/ScreenTools.pas

@@ -126 +126 @@
 function ScaleFromNative(Value: Integer): Integer;
 procedure UnshareBitmap(Bitmap: TBitmap);
+procedure Gtk2Fix;
 
 const
@@ -1663 +1664 @@
 end;
 
+procedure Gtk2Fix;
+var
+  I: Integer;
+begin
+  {$IFDEF LINUX}
+  // Wait and process messages little bit to avoid crash or force repaint under Gtk2
+  for I := 0 to 10 do begin
+    Sleep(1);
+    Application.ProcessMessages;
+  end;
+  {$ENDIF}
+end;
+
 procedure LoadFonts;
 var