Merge branch 'check-wsl-before-main'

src/mainwindow.pas

@@ -50,7 +50,6 @@   TWslGuiToolMainWindow = class(TForm)
     IconListToolbar: TImageList;
     ToolBar1: TToolBar;
     ToolButtonRun: TToolButton;
-    procedure CheckIfWslIsInstalledExecute(Sender: TObject);
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
     procedure FormHide(Sender: TObject);
@@ -240,18 +239,6 @@ function NumberItemSelected(List: TListView): integer;
   end;
 end;
 
-procedure TWslGuiToolMainWindow.CheckIfWslIsInstalledExecute(Sender: TObject);
-begin
-  if not WslCommandLine.IsWslInstalled()
-  then begin
-    Application.MessageBox(
-      'WSL seems to be not installed!',
-      'Error',
-      MB_OK + MB_ICONERROR);
-    Application.Terminate;
-  end;
-end;
-
 procedure TWslGuiToolMainWindow.FormCreate(Sender: TObject);
 begin
   BackgroundProcessProgressBar := TBackgroundProcessProgressBar.Create(Self);
@@ -263,7 +250,6 @@ procedure TWslGuiToolMainWindow.FormCreate(Sender: TObject);
 
   StatusbarImageIndex := -1;
   StatusbarMessage := '';
-  Self.CheckIfWslIsInstalledExecute(Sender);
 end;
 
 procedure TWslGuiToolMainWindow.FormDestroy(Sender: TObject);

src/wslguitool.lpr

@@ -11,16 +11,28 @@
   ApplicationInfo, AboutWindow, DistributionPropertiesWindow,
   ImportDistributionWindow, RunCommandWithUserWindow, PromptWindow,
   BackgroundProcessProgressBar, ProcessResultDisplay, WslConfigEditWindow,
-  Wslconfig, WslconfigParameterCtrl;
-
+  Wslconfig, WslconfigParameterCtrl, LCLType;
 
 {$R *.res}
 
 begin
   RequireDerivedFormResource:=True;
+
   Application.Scaled:=True;
   Application.Initialize;
-  Application.CreateForm(TWslGuiToolMainWindow, WslGuiToolMainWindow);
-  Application.Run;
+
+  if WslCommandLine.IsWslInstalled() then
+  begin
+    Application.CreateForm(TWslGuiToolMainWindow, WslGuiToolMainWindow);
+    Application.Run;
+  end
+  else begin
+    Application.MessageBox(
+      'WSL seems to be not installed!',
+      'Error',
+      MB_OK + MB_ICONERROR
+    );
+    Application.Terminate;
+  end;
 end.