From 749a740ffa4a3056060060f2e600ef7ab1e68ecc Mon Sep 17 00:00:00 2001
From: Teo Mrnjavac <teo@kde.org>
Date: Fri, 26 Feb 2016 13:13:01 +0100
Subject: [PATCH] Ensure the resizing items aren't null (fix Coverity defect
 121862).

---
 src/modules/partition/gui/PartitionSplitterWidget.cpp | 2 +-
 src/modules/partition/gui/PartitionSplitterWidget.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/partition/gui/PartitionSplitterWidget.cpp b/src/modules/partition/gui/PartitionSplitterWidget.cpp
index fa3da1e65..cafb5e26a 100644
--- a/src/modules/partition/gui/PartitionSplitterWidget.cpp
+++ b/src/modules/partition/gui/PartitionSplitterWidget.cpp
@@ -121,7 +121,7 @@ PartitionSplitterWidget::setSplitPartition( const QString& path,
              << "\nmaxSize:" << maxSize
              << "\nprfSize:" << preferredSize;
 
-    if ( m_itemToResize || m_itemToResizeNext || !m_itemToResizePath.isEmpty() )
+    if ( m_itemToResize && m_itemToResizeNext )
     {
         cDebug() << "NOTICE: trying to split partition but partition to split is already set.";
 
diff --git a/src/modules/partition/gui/PartitionSplitterWidget.h b/src/modules/partition/gui/PartitionSplitterWidget.h
index 0fe819e2f..5065a94ca 100644
--- a/src/modules/partition/gui/PartitionSplitterWidget.h
+++ b/src/modules/partition/gui/PartitionSplitterWidget.h
@@ -44,7 +44,7 @@ struct PartitionSplitterItem
 
     static PartitionSplitterItem null() { return { QString(), QColor(), false, 0, Normal }; }
 
-    bool isNull() const { return itemPath.isEmpty() && size == 0; }
+    bool isNull() const { return itemPath.isEmpty() && size == 0 && status == Normal; }
     operator bool() const { return !isNull(); }
 };