applications/calamares
3
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-02-24 19:05:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

[libcalamaresui] Avoid nullptr deref

Browse source 
- there's a check already there, and probably this means things are hopelessly
  broken anyway, but let's not crash here.
This commit is contained in:
Adriaan de Groot 2020-06-24 20:48:06 +02:00
parent 4a6ee39f8b
commit 347a25d13d
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/libcalamaresui/ViewManager.cpp
View file

@ -128,15 +128,19 @@ ViewManager::insertViewStep( int before, ViewStep* step )
{ {
cError() << "ViewStep" << step->moduleInstanceKey() << "has no widget."; cError() << "ViewStep" << step->moduleInstanceKey() << "has no widget.";
} }
else
QLayout* layout = step->widget()->layout();
if ( layout )
{ {
layout->setContentsMargins( 0, 0, 0, 0 ); // step->adjustMargins() "some magic"
QLayout* layout = step->widget()->layout();
if ( layout )
{
layout->setContentsMargins( 0, 0, 0, 0 );
}
m_stack->insertWidget( before, step->widget() );
m_stack->setCurrentIndex( 0 );
step->widget()->setFocus();
} }
m_stack->insertWidget( before, step->widget() );
m_stack->setCurrentIndex( 0 );
step->widget()->setFocus();
emit endInsertRows(); emit endInsertRows();
} }