Changeset 90270 in vbox

Timestamp:

Jul 21, 2021 10:10:43 AM (4 years ago)

Author:

vboxsync

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

145809

Message:

FE/Qt: bugref:10067: A bit of cleanup in UIMediumItem, preparing for notification-center.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/medium

Files:

• UIMediumItem.cpp (modified) (3 diffs)
• UIMediumItem.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumItem.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2009-2020 Oracle Corporation
+ * Copyright (C) 2009-2021 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -23 +23 @@
 #include "QIFileDialog.h"
 #include "QIMessageBox.h"
+#include "UICommon.h"
 #include "UIExtraDataManager.h"
 #include "UIIconPool.h"
 #include "UIMediumItem.h"
 #include "UIMessageCenter.h"
-#include "UICommon.h"
 
 /* COM includes: */
 #include "CMachine.h"
 #include "CMediumAttachment.h"
+#include "CMediumFormat.h"
 #include "CStorageController.h"
-#include "CMediumFormat.h"
 
 
@@ -70 +70 @@
                                                               tr("Choose the location of this medium"),
                                                                  0, true, true);
-    /* Negative if nothing changed: */
-    if (strFileName.isNull())
+    if (strFileName.isNull() || strFileName == location())
         return false;
 
     /* Search for corresponding medium: */
     CMedium comMedium = medium().medium();
+    if (comMedium.isNull() || !comMedium.isOk())
+        return false;
 
     /* Try to assign new medium location: */

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumItem.h

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2009-2020 Oracle Corporation
+ * Copyright (C) 2009-2021 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -23 +23 @@
 
 /* GUI includes: */
+#include "QITreeWidget.h"
 #include "UIMedium.h"
 #include "UIMediumDetailsWidget.h"
-#include "QITreeWidget.h"
 
 /** QITreeWidgetItem extension representing Media Manager item. */