From 6316173f1ba87aede1a1c872b9997a6919374c30 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 11 Feb 2019 17:45:23 -0500 Subject: [PATCH] [partition] More conservative handling of device pointers - thanks @abucodonosor --- src/modules/partition/gui/PartitionPage.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/modules/partition/gui/PartitionPage.cpp b/src/modules/partition/gui/PartitionPage.cpp index 86de992e6..2743ec53a 100644 --- a/src/modules/partition/gui/PartitionPage.cpp +++ b/src/modules/partition/gui/PartitionPage.cpp @@ -165,9 +165,13 @@ PartitionPage::updateButtons() if ( m_ui->deviceComboBox->currentIndex() >= 0 ) { + Device* device = nullptr; QModelIndex deviceIndex = m_core->deviceModel()->index( m_ui->deviceComboBox->currentIndex(), 0 ); - auto device = m_core->deviceModel()->deviceForIndex( deviceIndex ); - if ( device->type() != Device::Type::LVM_Device ) + if ( deviceIndex.isValid() ) + device = m_core->deviceModel()->deviceForIndex( deviceIndex ); + if ( !device ) + cWarning() << "Device for updateButtons is nullptr"; + else if ( device->type() != Device::Type::LVM_Device ) { createTable = true;