Changeset 62047 in vbox for trunk

Timestamp:

Jul 6, 2016 11:14:19 AM (9 years ago)

Author:

vboxsync

Message:

bugref:8344. small improvement. Always uses original extension of image.

File:

• trunk/src/VBox/Main/src-server/MediumImpl.cpp (modified) (1 diff)

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

@@ -3035 +3035 @@
                     destMediumPath = sourceMediumPath.stripFilename().append(RTPATH_SLASH).append(destMediumFileName);
                 }
-                else
+                suffix = i_getFormat();
+
+                if (suffix.compare("RAW", Utf8Str::CaseInsensitive) == 0)
                 {
-                    /* set the target extension like on the source. Permission to convert is prohibited */
-                    suffix = i_getFormat();
-
-                    if (suffix.compare("RAW", Utf8Str::CaseInsensitive) == 0)
+                    if(i_getDeviceType() == DeviceType_DVD)
                     {
-                        if(i_getDeviceType() == DeviceType_DVD)
-                        {
-                            suffix = "iso";
-                        }
-                        else
-                        {
-                            rc = setError(VERR_NOT_A_FILE,
-                                   tr("Medium '%s' has RAW type. \"Move\" operation isn't supported for this type."),
-                                   i_getLocationFull().c_str());
-                            throw rc;
-                        }
+                        suffix = "iso";
                     }
-
-                    suffix.toLower();
-                    destMediumPath.stripSuffix().append('.').append(suffix);
+                    else
+                    {
+                        rc = setError(VERR_NOT_A_FILE,
+                               tr("Medium '%s' has RAW type. \"Move\" operation isn't supported for this type."),
+                               i_getLocationFull().c_str());
+                        throw rc;
+                    }
                 }
+                /* set the target extension like on the source. Any conversions are prohibited */
+                suffix.toLower();
+                destMediumPath.stripSuffix().append('.').append(suffix);
             }