From b99fa43e6a75efbea8bb0568876e15e2664fedb8 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 14 Jun 2017 12:21:02 -0400
Subject: [PATCH] PartitionModule: skip nullptr devices, and report count
FIXES #686
---
src/modules/partition/core/PartitionCoreModule.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/modules/partition/core/PartitionCoreModule.cpp b/src/modules/partition/core/PartitionCoreModule.cpp
index 151dce4a43..6abb4b03d1 100644
--- a/src/modules/partition/core/PartitionCoreModule.cpp
+++ b/src/modules/partition/core/PartitionCoreModule.cpp
@@ -157,9 +157,9 @@ PartitionCoreModule::doInit()
// Remove the device which contains / from the list
for ( QList< Device* >::iterator it = devices.begin(); it != devices.end(); )
- if ( *it && ( hasRootPartition( *it ) ||
+ if ( ! (*it) || hasRootPartition( *it ) ||
(*it)->deviceNode().startsWith( "/dev/zram") ||
- isIso9660( *it ) ) )
+ isIso9660( *it ) )
it = devices.erase( it );
else
++it;
@@ -171,6 +171,7 @@ PartitionCoreModule::doInit()
m_deviceInfos << deviceInfo;
cDebug() << device->deviceNode() << device->capacity() << device->name() << device->prettyName();
}
+ cDebug() << ".." << devices.count() << "devices detected.";
m_deviceModel->init( devices );
// The following PartUtils::runOsprober call in turn calls PartUtils::canBeResized,
--
GitLab