napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure the resizing items aren't null (fix Coverity defect 121862).

Browse Source
This commit is contained in:
Teo Mrnjavac 2016-02-26 13:13:01 +01:00
parent a0ac9d9f07
commit 749a740ffa
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/partition/gui/PartitionSplitterWidget.cpp
View File

@ -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.";

2
src/modules/partition/gui/PartitionSplitterWidget.h
View File

@ -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(); }
};