Changeset 14 for trunk

Timestamp:

Dec 27, 2017, 7:41:26 PM (7 years ago)

Author:

chronos

Message:

• Fixed: Terminate correctly running apps before scheduler stopped.

Location:

trunk

Files:

• ChronOS.lpi (modified) (1 diff)
• ChronOS.res (modified) ( previous)
• Forms/UFormMain.lfm (modified) (1 diff)
• Forms/UFormMain.pas (modified) (2 diffs)
• Platform/Base/UPlatformBase.pas (modified) (1 diff)

trunk/ChronOS.lpi

@@ -14 +14 @@
       <EnableI18N LFM="False"/>
     </i18n>
-    <VersionInfo>
-      <StringTable ProductVersion=""/>
-    </VersionInfo>
     <BuildModes Count="2">
       <Item1 Name="Debug" Default="True"/>

trunk/Forms/UFormMain.lfm

@@ -5 +5 @@
   Width = 932
   Caption = 'Screen 1 - ChronOS'
-  ClientHeight = 662
+  ClientHeight = 656
   ClientWidth = 932
   Menu = MainMenu1
+  OnClose = FormClose
   OnCreate = FormCreate
   OnDestroy = FormDestroy
   OnKeyDown = FormKeyDown
   OnShow = FormShow
-  LCLVersion = '1.6.4.0'
+  LCLVersion = '1.8.0.4'
   object PaintBox1: TPaintBox
     Left = 0
-    Height = 662
+    Height = 656
     Top = 0
     Width = 932

trunk/Forms/UFormMain.pas

@@ -29 +29 @@
     procedure AFullscreenExecute(Sender: TObject);
     procedure AShowTerminalExecute(Sender: TObject);
+    procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
@@ -124 +125 @@
 end;
 
+procedure TFormMain.FormClose(Sender: TObject; var CloseAction: TCloseAction);
+begin
+  Kernel.Terminate;
+end;
+
 procedure TFormMain.SwitchFullScreen;
 begin

trunk/Platform/Base/UPlatformBase.pas

@@ -263 +263 @@
 begin
   inherited Stop;
-  for I := 0 to Tasks.Count - 1 do
+  for I := 0 to Tasks.Count - 1 do begin
     TBaseTask(Tasks[I]).Terminated := True;
+    TBaseTask(Tasks[I]).Thread.WaitFor;
+  end;
 end;