[LYN-3195] Fixed fancy docking restore state to only touch dock tab containers that it created

Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-06-30 15:26:27 -05:00
parent 827855f01c
commit 20775b7745
1 changed files with 7 additions and 7 deletions
@@ -3288,16 +3288,16 @@ namespace AzQtComponents
        }

        // Untab tabbed dock widgets before restoring, as the restore only works on dock widgets parented directly to the main window
-        const QList<QDockWidget*> dockWidgets = m_mainWindow->findChildren<QDockWidget*>();
-        for (QDockWidget* dockWidget : dockWidgets)
+        for (QDockWidget* dockWidget : m_mainWindow->findChildren<QDockWidget*>(
+            QRegularExpression(QString("%1.*").arg(m_tabContainerIdentifierPrefix)), Qt::FindChildrenRecursively))
        {
-            if (QStackedWidget* stackedWidget = qobject_cast<QStackedWidget*>(dockWidget->parentWidget()))
+            DockTabWidget* tabWidget = qobject_cast<DockTabWidget*>(dockWidget->widget());
+            if (!tabWidget)
            {
-                if (AzQtComponents::DockTabWidget* tabWidget = qobject_cast<AzQtComponents::DockTabWidget*>(stackedWidget->parentWidget()))
-                {
-                    tabWidget->removeTab(dockWidget);
-                }
+                continue;
            }
+
+            tabWidget->closeTabs();
        }

        // Restore the floating windows