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

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

Author: jerome
Date: 2009-09-17 09:17:48 +0200 (Thu, 17 Sep 2009)
New Revision: 5422

Modified:
   software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas
Log:
* Replaced HID installation timeout by a dialog box.

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 06:52:11 UTC (rev 5421)
+++ software_suite_v3/software/tool/tool-second-installer/trunk/tool-second-installer/Unit1.pas	2009-09-17 07:17:48 UTC (rev 5422)
@@ -356,24 +356,23 @@
     //****  Step 3 on screen => Testing dongle state****//
     begin
 
-      Inc(hardwareTestCount, 1);
-
-      //Checking first HID state.
-      with TDongleHIDCheck.create(nil) do
-        begin
-          invalidateButtons();
-          if not Check() then
-            BoxOk1.showMessageDialog(gettext(HID_INSTALL_WAIT), gettext(OK));
-          validateButtons();
-        end;
-
       if not TuxUtils.isDongleConnected(values) then
         begin
           invalidateButtons();
-          Report.DONGLE := False;
-          BoxOk1.showMessageDialog(gettext(DONGLE_ERROR), gettext(OK));
-          Steps.ActivePageIndex := 1;
-          NextLabel.Caption := gettext(NEXTB);
+
+          //Checking first HID state.
+          with TDongleHIDCheck.create(nil) do
+
+            if not Check() then
+              BoxOk1.showMessageDialog(gettext(HID_INSTALL_WAIT), gettext(OK))
+            else
+              begin
+              Report.DONGLE := False;
+              BoxOk1.showMessageDialog(gettext(DONGLE_ERROR), gettext(OK));
+              Steps.ActivePageIndex := 1;
+              NextLabel.Caption := gettext(NEXTB);
+              end;
+
           Next.OnMouseUp := Form1.NextMouseUp;
           NextLabel.OnMouseUp := Form1.NextMouseUp;
         end