Changeset 55986 in vbox for trunk/src

Timestamp:

May 20, 2015 7:43:19 PM (10 years ago)

Author:

vboxsync

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

100495

Message:

FE/Qt: 7848: Fixing potential crash: Clear chooser-pane-item from 'current' and 'focused' flags earlier if possible (s.a. r100494).

Location:

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser

Files:

• UIGChooserHandlerMouse.cpp (modified) (1 diff)
• UIGChooserModel.cpp (modified) (4 diffs)
• UIGChooserModel.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserHandlerMouse.cpp

@@ -109 +109 @@
                         /* Move focus to clicked item: */
                         model()->setFocusItem(pClickedItem);
+                        model()->makeSureSomeItemIsSelected();
                     }
                     /* Was no modifiers pressed? */

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp

@@ -278 +278 @@
 {
     /* Call for wrapper above: */
-    setCurrentItems(QList<UIGChooserItem*>() << pItem);
+    QList<UIGChooserItem*> items;
+    if (pItem)
+        items << pItem;
+    setCurrentItems(items);
+
     /* Move focus to current-item: */
     setFocusItem(currentItem());
@@ -344 +348 @@
 }
 
-void UIGChooserModel::notifyCurrentItemChanged()
+void UIGChooserModel::makeSureSomeItemIsSelected()
 {
     /* Make sure selection item list is never empty
@@ -350 +354 @@
     if (!currentItem() && focusItem())
         setCurrentItem(focusItem());
+}
+
+void UIGChooserModel::notifyCurrentItemChanged()
+{
     /* Notify listeners about selection change: */
     emit sigSelectionChanged();
@@ -1493 +1501 @@
     if (iResultCode == AlertButton_Cancel)
         return;
+
+    /* Unset current item(s): */
+    unsetCurrentItem();
 
     /* For every selected item: */

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.h

@@ -124 +124 @@
     void addToCurrentItems(UIGChooserItem *pItem);
     void removeFromCurrentItems(UIGChooserItem *pItem);
+    void makeSureSomeItemIsSelected();
     void notifyCurrentItemChanged();
     bool isSingleGroupSelected() const;