VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-09-28 15:56:33 -04:00
Code Issues Projects Releases Wiki Activity

RollupWidget: fixed segfault in restoreState by swapping loops

Browse Source
This commit is contained in:
f4exb 2022-01-11 23:20:22 +01:00
parent ebd5216917
commit c2db32201f
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sdrgui/gui/rollupwidget.cpp
View File

@ -89,11 +89,11 @@ void RollupWidget::saveState(RollupState &state) const
QList<RollupState::RollupChildState>& childrenStates = state.getChildren(); QList<RollupState::RollupChildState>& childrenStates = state.getChildren();
childrenStates.clear(); childrenStates.clear();
for (int i = 0; i < children().count(); ++i) for (const auto &child : children())
{ {
QWidget* r = qobject_cast<QWidget*>(children()[i]); QWidget* r = qobject_cast<QWidget*>(child);
if (r) { if (r && isRollupChild(r)) {
childrenStates.push_back({r->objectName(), r->isHidden()}); childrenStates.push_back({r->objectName(), r->isHidden()});
} }
} }
@ -161,15 +161,15 @@ void RollupWidget::restoreState(const RollupState& state)
{ {
const QList<RollupState::RollupChildState>& childrenStates = state.getChildren(); const QList<RollupState::RollupChildState>& childrenStates = state.getChildren();
for (const auto &childState : childrenStates) for (const auto &object : children())
{ {
for (int j = 0; j < children().count(); ++j) QWidget* r = qobject_cast<QWidget*>(object);
{
QWidget* r = qobject_cast<QWidget*>(children()[j]);
if (r) if (r && isRollupChild(r))
{
for (const auto &childState : childrenStates)
{ {
if (r->objectName() == childState.m_objectName) if (childState.m_objectName.compare(r->objectName()) == 0)
{ {
if (childState.m_isHidden) { if (childState.m_isHidden) {
r->hide(); r->hide();