Linux: do not re-create drives on PropertiesChanged signal from Udisk…

…s2 (#650) Resolves #640
FedoraQt · Oct 7, 2023 · 986fc6a · 986fc6a
1 parent 6fcc120
commit 986fc6a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/src/app/drivemanager.cpp b/src/app/drivemanager.cpp
@@ -241,6 +241,13 @@ Progress *Drive::progress() const
     return m_progress;
 }
 
+void Drive::updateDrive(const QString &name, uint64_t size, bool containsLive)
+{
+    m_name = name;
+    m_size = size;
+    setRestoreStatus(containsLive ? CONTAINS_LIVE : CLEAN);
+}
+
 QString Drive::name() const
 {
     return QString("%1 (%2)").arg(m_name).arg(readableSize());

diff --git a/src/app/drivemanager.h b/src/app/drivemanager.h
@@ -162,6 +162,8 @@ class Drive : public QObject
 
     Progress *progress() const;
 
+    virtual void updateDrive(const QString &name, uint64_t size, bool containsLive = false);
+
     virtual QString name() const;
     virtual QString readableSize() const;
     virtual qreal size() const;

diff --git a/src/app/linuxdrivemanager.cpp b/src/app/linuxdrivemanager.cpp
@@ -88,11 +88,11 @@ QDBusObjectPath LinuxDriveProvider::handleObject(const QDBusObjectPath &object_p
         mDebug() << this->metaObject()->className() << "New drive" << driveId.path() << "-" << name << "(" << size << "bytes;" << (isValid ? "removable;" : "nonremovable;") << connectionBus << ")";
 
         if (isValid) {
-            // TODO find out why do I do this
             if (m_drives.contains(object_path)) {
-                LinuxDrive *tmp = m_drives[object_path];
-                emit DriveProvider::driveRemoved(tmp);
+                m_drives[object_path]->updateDrive(name, size, isoLayout);
+                return object_path;
             }
+
             LinuxDrive *d = new LinuxDrive(this, object_path.path(), name, size, isoLayout);
             m_drives[object_path] = d;
             emit DriveProvider::driveConnected(d);