Merge branch 'develop' into KDESKTOP-830-Implement-functions-to-gener…

…ate-the-support-log-arrchive
Infomaniak · May 6, 2024 · 4d11482 · 4d11482
2 parents bc177d1 + a206e2b
commit 4d11482
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/src/gui/drivepreferenceswidget.cpp b/src/gui/drivepreferenceswidget.cpp
@@ -281,8 +281,8 @@ void DrivePreferencesWidget::refreshStatus() {
 
     if (const auto driveInfoMapIt = _gui->driveInfoMap().find(_driveDbId); driveInfoMapIt != _gui->driveInfoMap().cend()) {
         const auto &driveInfo = driveInfoMapIt->second;
-        if (!_mainVBox->isEnabled() && !driveInfo.isBeingDeleted()) {
-            // Re-enable the drive preferences widget after a deletion attempt.
+        if (!driveInfo.isBeingDeleted()) {
+            // Re-enable the drive preferences widget after a failed deletion attempt.
             setCustomToolTipText("");
             GuiUtility::setEnabledRecursively(this, true);
         }
@@ -1043,7 +1043,6 @@ void DrivePreferencesWidget::onDriveBeingRemoved() {
     driveInfoIt->second.setIsBeingDeleted(true);
 
     // Lock all GUI drive-related actions during drive deletion.
-    GuiUtility::setEnabledRecursively<QLayout>(_mainVBox, false);
     for (auto *child : findChildren<QWidget *>()) {
         GuiUtility::setEnabledRecursively<QWidget>(child, false);
     }

diff --git a/src/gui/driveselectionwidget.cpp b/src/gui/driveselectionwidget.cpp
@@ -84,7 +84,7 @@ QSize DriveSelectionWidget::sizeHint() const {
 void DriveSelectionWidget::clear() {
     _currentDriveDbId = 0;
     _downIconLabel->setVisible(false);
-    setDriveIcon();
+    setDriveIcon(defaultDriveColor);
     retranslateUi();
 }
 
@@ -188,17 +188,17 @@ void DriveSelectionWidget::setDriveIcon() {
     }
 
     ExitCode exitCode;
-    QColor defaultDriveColor;
-    exitCode = GuiRequests::getDriveDefaultColor(defaultDriveColor);
+    QColor driveColor;
+    exitCode = GuiRequests::getDriveDefaultColor(driveColor);
     if (exitCode != ExitCodeOk) {
         qCWarning(lcDriveSelectionWidget()) << "Error in Requests::getDriveDefaultColor";
         return;
     }
 
-    setDriveIcon(defaultDriveColor);
+    setDriveIcon(driveColor);
 }
 
-void DriveSelectionWidget::setDriveIcon(const QColor &color = defaultDriveColor) {
+void DriveSelectionWidget::setDriveIcon(const QColor &color) {
     if (_driveIconLabel) {
         _driveIconLabel->setPixmap(
             KDC::GuiUtility::getIconWithColor(":/client/resources/icons/actions/drive.svg", color).pixmap(_driveIconSize));

diff --git a/src/gui/guiutility.h b/src/gui/guiutility.h
@@ -104,6 +104,8 @@ bool getLinuxDesktopType(QString &type, QString &version);
 #endif
 template <class C>
 void setEnabledRecursively(C *root, bool enabled) {
+    if (!root) return;
+
     root->setEnabled(enabled);
     for (auto *child : root->template findChildren<QLayout *>()) {
         setEnabledRecursively(child, enabled);

diff --git a/src/libsyncengine/propagation/executor/executorworker.cpp b/src/libsyncengine/propagation/executor/executorworker.cpp
@@ -2138,6 +2138,9 @@ bool ExecutorWorker::propagateCreateToDbAndTree(SyncOpPtr syncOp, const NodeId &
         updateTree->insertNode(node);
 
         newCorrespondingParentNode->insertChildren(node);
+
+        // Affected node does not have a valid DB ID yet, update it
+        syncOp->affectedNode()->setIdb(newDbNodeId);
     }
 
     return true;