[tuxdroid-svn] r5244 - software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser

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

Author: remi
Date: 2009-07-30 16:34:52 +0200 (Thu, 30 Jul 2009)
New Revision: 5244

Modified:
   software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dfm
   software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas
Log:
* Fixed "Access violation" error on TuxBox exiting
* Fixed state on/off tray icon switching bug
* Updated server running check at TuxBox initialization

Modified: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dfm
===================================================================
--- software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dfm	2009-07-30 14:31:41 UTC (rev 5243)
+++ software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.dfm	2009-07-30 14:34:52 UTC (rev 5244)
@@ -89,7 +89,7 @@
   end
   object StatusBar1: TStatusBar
     Left = 0
-    Top = 600
+    Top = 607
     Width = 955
     Height = 19
     Panels = <>

Modified: software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas
===================================================================
--- software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas	2009-07-30 14:31:41 UTC (rev 5243)
+++ software_suite_v3/software/tool/tux_droid_browser/windows/trunk/tux_droid_browser/Unit1.pas	2009-07-30 14:34:52 UTC (rev 5244)
@@ -247,6 +247,19 @@
   if not TuxUtils.isTuxDroidServerStarted() then
     begin
       TuxUtils.startServer(Application);
+    end
+    else
+    begin
+      if not TuxUtils.userPageIsReady then
+        begin
+          TuxUtils.startServer(Application);
+        end
+        else
+        begin
+          Sleep(500);
+          if not TuxUtils.userPageIsReady then
+            TuxUtils.startServer(Application);
+        end;
     end;
 
   //Show the systray icon
@@ -403,7 +416,6 @@
         Form1.saveProperties;
         properties.Free;
         ConnectionChecker.Enabled := false;
-        ConnectionChecker.Free;
         AppIcon.Free;
         Form1.DeleteSysTrayIcon;
         Application.Terminate;
@@ -613,8 +625,10 @@
         begin
           if balloonShowed then
             Form1.HideBalloonTips();
-
-          ImageList1.GetIcon(1, AppIcon);
+          if connection then
+            ImageList1.GetIcon(0, AppIcon)
+          else
+            ImageList1.GetIcon(1, AppIcon);
           IconData.hIcon := AppIcon.Handle;
           Shell_NotifyIcon(Nim_Modify, @IconData);
         end;