mirrors/Qt-Advanced-Docking-System
1
0
Fork 0
mirror of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System.git synced 2025-04-01 02:42:39 +08:00
Code

Fixed a bug in restoreStateFromXml function

Browse Source 
The function accessed the objectName from the CentralWidget even if there is no cental widget
This commit is contained in:
Uwe Kindler 2020-09-25 14:40:28 +02:00
parent f543318232
commit 5fad43377b
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/DockManager.cpp
View File

@ -280,22 +280,25 @@ bool DockManagerPrivate::restoreStateFromXml(const QByteArray &state, int versi
#endif #endif
ADS_PRINT(DockContainers); ADS_PRINT(DockContainers);
const auto CentralWidgetAttribute = s.attributes().value("CentralWidget"); if (CentralWidget)
// If we have a central widget but a state without central widget, then {
// something is wrong. const auto CentralWidgetAttribute = s.attributes().value("CentralWidget");
if (CentralWidget && CentralWidgetAttribute.isEmpty()) // If we have a central widget but a state without central widget, then
{ // something is wrong.
qWarning() << "Dock manager has central widget but saved state does not have central widget."; if (CentralWidgetAttribute.isEmpty())
return false; {
} qWarning() << "Dock manager has central widget but saved state does not have central widget.";
return false;
}
// If the object name of the central widget does not match the name of the // If the object name of the central widget does not match the name of the
// saved central widget, the something is wrong // saved central widget, the something is wrong
if (CentralWidget->objectName() != CentralWidgetAttribute.toString()) if (CentralWidget->objectName() != CentralWidgetAttribute.toString())
{ {
qWarning() << "Object name of central widget does not match name of central widget in saved state."; qWarning() << "Object name of central widget does not match name of central widget in saved state.";
return false; return false;
} }
}
int DockContainerCount = 0; int DockContainerCount = 0;
while (s.readNextStartElement()) while (s.readNextStartElement())