Changeset 69398 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Oct 26, 2017 6:58:20 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

118725

Message:

Main/Medium: Back out previous change, it had good intentions but broke things in a different way. This needs to be fixed elsewhere.

File:

• trunk/src/VBox/Main/src-server/MediumImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/src-server/MediumImpl.cpp

@@ -4769 +4769 @@
             /* use the existing progress object... */
             pProgress = *aProgress;
-        }
-        else
-        {
+
             /* ...but create a new one if it is null */
-
-            pProgress.createObject();
-            rc = pProgress->init(m->pVirtualBox,
-                                 static_cast<IMedium*>(this),
-                                 BstrFmt(tr("Creating differencing medium storage unit '%s'"),
-                                         aTarget->m->strLocationFull.c_str()).raw(),
-                                 TRUE /* aCancelable */);
-            if (FAILED(rc))
-                throw rc;
+            if (pProgress.isNull())
+            {
+                pProgress.createObject();
+                rc = pProgress->init(m->pVirtualBox,
+                                     static_cast<IMedium*>(this),
+                                     BstrFmt(tr("Creating differencing medium storage unit '%s'"),
+                                             aTarget->m->strLocationFull.c_str()).raw(),
+                                     TRUE /* aCancelable */);
+                if (FAILED(rc))
+                    throw rc;
+            }
         }
 
@@ -5113 +5113 @@
             /* use the existing progress object... */
             pProgress = *aProgress;
-        }
-        else
-        {
+
             /* ...but create a new one if it is null */
             if (pProgress.isNull())
@@ -5789 +5787 @@
             /* use the existing progress object... */
             pProgress = *aProgress;
-        }
-        else
-        {
+
             /* ...but create a new one if it is null */
-            Utf8Str tgtName;
-            {
-                AutoReadLock alock(pTarget COMMA_LOCKVAL_SRC_POS);
-                tgtName = pTarget->i_getName();
-            }
-
-            AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-            pProgress.createObject();
-            rc = pProgress->init(m->pVirtualBox,
-                                 static_cast<IMedium*>(this),
-                                 BstrFmt(tr("Merging medium '%s' to '%s'"),
-                                         i_getName().c_str(),
-                                         tgtName.c_str()).raw(),
-                                 TRUE /* aCancelable */);
-            if (FAILED(rc))
-                throw rc;
+            if (pProgress.isNull())
+            {
+                Utf8Str tgtName;
+                {
+                    AutoReadLock alock(pTarget COMMA_LOCKVAL_SRC_POS);
+                    tgtName = pTarget->i_getName();
+                }
+
+                AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+                pProgress.createObject();
+                rc = pProgress->init(m->pVirtualBox,
+                                     static_cast<IMedium*>(this),
+                                     BstrFmt(tr("Merging medium '%s' to '%s'"),
+                                             i_getName().c_str(),
+                                             tgtName.c_str()).raw(),
+                                     TRUE /* aCancelable */);
+                if (FAILED(rc))
+                    throw rc;
+            }
         }
 
@@ -5829 +5828 @@
         {
             rc = pTask->runNow();
+
             delete pTask;
         }