From: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Date: Thu, 4 May 2023 10:29:54 +0000 (+0200)
Subject: allow the conflicts dialog to close
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~10^2~44^2~13
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=382a58c6bdb49cdd9468e91b9dded27e202b5eaa;p=nextcloud-desktop.git

allow the conflicts dialog to close

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
---

diff --git a/src/gui/ResolveConflictsDialog.qml b/src/gui/ResolveConflictsDialog.qml
index bf6422fe6..6f8241c14 100644
--- a/src/gui/ResolveConflictsDialog.qml
+++ b/src/gui/ResolveConflictsDialog.qml
@@ -37,7 +37,7 @@ QtWindow.Window {
     title: qsTr('Solve sync conflicts')
 
     onClosing: function(close) {
-        Systray.destroyDialog(root);
+        Systray.destroyDialog(self);
         close.accepted = true
     }