From: Matthieu Gallien Date: Wed, 3 May 2023 16:28:55 +0000 (+0200) Subject: do not show many conflicts dialog for a single conflict X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~10^2~44^2~20 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c118958d3d4363f18abe0f1fc7639022bbbe3f25;p=nextcloud-desktop.git do not show many conflicts dialog for a single conflict Signed-off-by: Matthieu Gallien --- 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)