Merge branch 'jb34731' into 'master'

[filemanager] Don't allow overriding files but emit error. Fixes JB#34731 See merge request !4
sailfishos · Apr 1, 2016 · 5ea6ee6 · 5ea6ee6
2 parents dd6b564 + afe6cd9
commit 5ea6ee6
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/fileengine.cpp b/src/fileengine.cpp
@@ -147,6 +147,10 @@ void FileEngine::pasteFiles(QString destDirectory)
             return;
         }
 
+        if (QFile::exists(newName)) {
+            emit error(ErrorCopyFailed, fileName);
+            return;
+        }
     }
 
     m_clipboardFiles.clear();