[tuxdroid-svn] r5427 - software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer

[jerome <c2m...@c2...>]

Author: jerome
Date: 2009-09-17 10:57:19 +0200 (Thu, 17 Sep 2009)
New Revision: 5427

Modified:
   software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas
Log:
* Removed unused var.
* Trying to start the server two times.

Modified: software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas
===================================================================
--- software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas	2009-09-17 08:43:55 UTC (rev 5426)
+++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas	2009-09-17 08:57:19 UTC (rev 5427)
@@ -202,6 +202,7 @@
     procedure setImage(Btn : TImage; ImageLocation : string);
     procedure ShowSplashScreen();
     procedure HideSplashScreen();
+    procedure startWithSplash();
   public
     { Darations publiques }
   end;
@@ -212,7 +213,6 @@
   BoxOk1  : TForm3;
   values : TStringList;
   testCount : byte;
-  hardwareTestCount : byte;
 
 implementation
 
@@ -258,7 +258,6 @@
   LabelSendReport.Caption := gettext(END_SEND_REPORT);
 
   testCount := 1;
-  hardwareTestCount := 1;
 
   TuxUtils.initKnowedVars();
 
@@ -304,14 +303,24 @@
   NextLabel.OnMouseUp := Form1.NextMouseUp;
 end;
 
-
-//Start smart core and display splashscreen.
-procedure TForm1.startServer();
+procedure TForm1.startWithSplash();
 begin
   Form1.Enabled := False;
   Form1.ShowSplashScreen();
   TuxUtils.startServer(Application);
   Form1.HideSplashScreen();
+end;
+
+
+//Start smart core and display splashscreen.
+procedure TForm1.startServer();
+begin
+  startWithSplash();
+
+  //If server is still not started, trying a second time.
+  if not TuxUtils.isTuxDroidServerStarted() then
+    startWithSplash();
+
   Steps.ActivePageIndex := 1;
   Form1.Enabled := True;