Changeset 3957 in vbox for trunk/src

Timestamp:

Aug 1, 2007 11:18:38 AM (17 years ago)

Author:

vboxsync

Message:

2142: GUI should download Additions:

1. Protection against double kill requests (this rare issue is possible due to all the http requests are asynchronized and the http-errors could be processed during the user's cancel-operation).
2. Bug fixed: If the network connection is closed during VM is running just before the Guest Additions download requested, the download procedure will hung & never notifies the user about the network connection is not available. 5 sec timer installed into the download request.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp (modified) (9 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp

@@ -220 +220 @@
         , mProgressBar (0), mCancelButton (0)
         , mAction (aAction), mStatus (0)
+        , mConnectDone (false), mSuicide (false)
     {
         /* Disable Install Guest Additions action */
@@ -266 +267 @@
 
         /* Try to get the required file for the information */
-        mHttp->get (mPath + mFile);
+        getFile();
     }
 
@@ -286 +287 @@
     void processProgress (int aRead, int aTotal)
     {
+        mConnectDone = true;
         if (aTotal != -1)
         {
@@ -311 +313 @@
         if (aError && mHttp->error() != QHttp::Aborted)
         {
+            mConnectDone = true;
             QString reason = mIsChecking ?
                 tr ("Could not connect to the server (%1).") :
@@ -346 +349 @@
     }
 
+    /* This slot is used to control the connection timeout. */
+    void processTimeout()
+    {
+        if (mConnectDone) return;
+        mHttp->abort();
+        abortDownload (tr ("The download process has been cancelled "
+                           "due to connection timeout."));
+    }
+
     /* This slot is used to process cancel-button clicking signal. */
     void processAbort()
     {
+        mConnectDone = true;
         mHttp->abort();
         abortDownload (tr ("The download process has been cancelled "
@@ -366 +379 @@
 private:
 
+    /* This function is used to make a request to get a file */
+    void getFile()
+    {
+        mConnectDone = false;
+        mHttp->get (mPath + mFile);
+        QTimer::singleShot (5000, this, SLOT (processTimeout()));
+    }
+
     /* This function is used to ask the user about he wants to download the
      * founded Guest Additions image or not. It also shows the progress-bar
@@ -377 +398 @@
         {
             mIsChecking = false;
-            mHttp->get (mPath + mFile);
+            getFile();
         }
         else
@@ -388 +409 @@
     void abortDownload (const QString &aReason)
     {
+        /* Protect against double kill request. */
+        if (mSuicide) return;
+        mSuicide = true;
+
         vboxProblem().cannotDownloadGuestAdditions (mProtocol + mHost +
                                                     mPath + mFile, aReason);
@@ -405 +430 @@
     QAction *mAction;
     int mStatus;
+    bool mConnectDone;
+    bool mSuicide;
 };