From c118958d3d4363f18abe0f1fc7639022bbbe3f25 Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Wed, 3 May 2023 18:28:55 +0200 Subject: [PATCH] do not show many conflicts dialog for a single conflict Signed-off-by: Matthieu Gallien --- src/gui/tray/activitylistmodel.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/gui/tray/activitylistmodel.cpp b/src/gui/tray/activitylistmodel.cpp index 6d7ceec74..3630bccad 100644 --- a/src/gui/tray/activitylistmodel.cpp +++ b/src/gui/tray/activitylistmodel.cpp @@ -749,8 +749,6 @@ void ActivityListModel::displaySingleConflictDialog(const Activity &activity) }); _currentConflictDialog->open(); ownCloudGui::raiseDialog(_currentConflictDialog); - - Systray::instance()->createResolveConflictsDialog(); } void ActivityListModel::slotTriggerAction(const int activityIndex, const int actionIndex) -- 2.30.2