From ee9fa0998e50588e3cb7cf3a224b1ef35cec9d85 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 25 Feb 2017 18:35:27 +0100 Subject: [PATCH] Fix use of wrong var in KIO plugin --- fileitemactionplugin/syncthingfileitemaction.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/fileitemactionplugin/syncthingfileitemaction.cpp b/fileitemactionplugin/syncthingfileitemaction.cpp index 4058631..6226a70 100644 --- a/fileitemactionplugin/syncthingfileitemaction.cpp +++ b/fileitemactionplugin/syncthingfileitemaction.cpp @@ -128,7 +128,10 @@ QList SyncthingFileItemAction::actions(const KFileItemListProperties } for(const QString &path : paths) { if(path == dirPath) { - detectedDirs << (lastDir = &dir); + lastDir = &dir; + if(!detectedDirs.contains(lastDir)) { + detectedDirs << lastDir; + } } else if(path.startsWith(dir.path)) { detectedItems << SyncthingItem(&dir, path.mid(dir.path.size())); lastDir = &dir; @@ -189,15 +192,15 @@ QList SyncthingFileItemAction::actions(const KFileItemListProperties if(isPaused) { actions << new QAction( QIcon::fromTheme(QStringLiteral("media-playback-start")), - containingDirs.size() == 1 - ? tr("Resume ") + containingDirs.front()->displayName() + detectedDirs.size() == 1 + ? tr("Resume ") + detectedDirs.front()->displayName() : tr("Resume selected directories"), parentWidget); } else { actions << new QAction( QIcon::fromTheme(QStringLiteral("media-playback-pause")), - containingDirs.size() == 1 - ? tr("Pause ") + containingDirs.front()->displayName() + detectedDirs.size() == 1 + ? tr("Pause ") + detectedDirs.front()->displayName() : tr("Pause selected directories"), parentWidget); }