From 382a58c6bdb49cdd9468e91b9dded27e202b5eaa Mon Sep 17 00:00:00 2001
From: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Date: Thu, 4 May 2023 12:29:54 +0200
Subject: [PATCH] allow the conflicts dialog to close

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
---
 src/gui/ResolveConflictsDialog.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
     }
 
-- 
2.30.2