From 5d6a80deaea43cec90bea2bc05e2b7036e9267ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20G=C3=A2teau?= <agateau@kde.org>
Date: Thu, 10 Jul 2014 19:01:55 +0200
Subject: [PATCH] Factorize management of m_hasRootMountPoint

---
 src/modules/partition/PartitionCoreModule.cpp | 31 +++++++++++++------
 src/modules/partition/PartitionCoreModule.h   |  2 +-
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/modules/partition/PartitionCoreModule.cpp b/src/modules/partition/PartitionCoreModule.cpp
index 74af09fc6..23411c19d 100644
--- a/src/modules/partition/PartitionCoreModule.cpp
+++ b/src/modules/partition/PartitionCoreModule.cpp
@@ -87,11 +87,7 @@ PartitionCoreModule::createPartition( Device* device, PartitionInfo* partitionIn
 
     m_jobs << Calamares::job_ptr( job );
 
-    if ( partitionInfo->mountPoint == "/" && !m_hasRootMountPoint )
-    {
-        m_hasRootMountPoint = true;
-        hasRootMountPointChanged( m_hasRootMountPoint );
-    }
+    updateHasRootMountPoint();
 }
 
 void
@@ -100,11 +96,6 @@ PartitionCoreModule::deletePartition( Device* device, Partition* partition )
     auto it = m_infoForPartitionHash.find( partition );
     if ( it != m_infoForPartitionHash.end() )
     {
-        if ( it.value()->mountPoint == "/" )
-        {
-            m_hasRootMountPoint = false;
-            hasRootMountPointChanged( m_hasRootMountPoint );
-        }
         m_infoForPartitionHash.erase( it );
     }
 
@@ -141,6 +132,7 @@ PartitionCoreModule::deletePartition( Device* device, Partition* partition )
     }
 
     refreshPartitionModel( device );
+    updateHasRootMountPoint();
 }
 
 void
@@ -160,3 +152,22 @@ PartitionCoreModule::refreshPartitionModel( Device* device )
     Q_ASSERT( model );
     model->reload();
 }
+
+void PartitionCoreModule::updateHasRootMountPoint()
+{
+    bool oldValue = m_hasRootMountPoint;
+
+    m_hasRootMountPoint = false;
+    for ( auto it : m_infoForPartitionHash )
+    {
+        if ( it->mountPoint == "/" )
+        {
+            m_hasRootMountPoint = true;
+        }
+    }
+
+    if ( oldValue != m_hasRootMountPoint )
+    {
+        hasRootMountPointChanged( m_hasRootMountPoint );
+    }
+}
diff --git a/src/modules/partition/PartitionCoreModule.h b/src/modules/partition/PartitionCoreModule.h
index 348801129..61b27bd36 100644
--- a/src/modules/partition/PartitionCoreModule.h
+++ b/src/modules/partition/PartitionCoreModule.h
@@ -78,7 +78,7 @@ private:
     QList< Calamares::job_ptr > m_jobs;
 
     void listDevices();
-
+    void updateHasRootMountPoint();
     void refreshPartitionModel( Device* device );
 
     void dumpQueue() const;