From e865ee0c465ff1165938d4ad3bd2132a336e1b5d Mon Sep 17 00:00:00 2001
From: gopienkonikita <nikita.gopienko@onlyoffice.com>
Date: Mon, 24 Jan 2022 14:17:14 +0300
Subject: [PATCH] Fixed Bug 55056 - Client.Files. Removed the possibility of
 simultaneous operations with files.

---
 .../ASC.Files/Client/src/store/FilesActionsStore.js  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/products/ASC.Files/Client/src/store/FilesActionsStore.js b/products/ASC.Files/Client/src/store/FilesActionsStore.js
index 9b39c8281bc..d54f8034077 100644
--- a/products/ASC.Files/Client/src/store/FilesActionsStore.js
+++ b/products/ASC.Files/Client/src/store/FilesActionsStore.js
@@ -663,8 +663,11 @@ class FilesActionStore {
     this.checkOperationConflict(operationData);
   };
 
-  checkFileConflicts = (destFolderId, folderIds, fileIds) =>
-    checkFileConflicts(destFolderId, folderIds, fileIds);
+  checkFileConflicts = (destFolderId, folderIds, fileIds) => {
+    this.filesStore.addActiveItems(fileIds);
+    this.filesStore.addActiveItems(null, folderIds);
+    return checkFileConflicts(destFolderId, folderIds, fileIds);
+  };
 
   setConflictDialogData = (conflicts, operationData) => {
     this.dialogsStore.setConflictResolveDialogItems(conflicts);
@@ -674,10 +677,7 @@ class FilesActionStore {
 
   checkOperationConflict = async (operationData) => {
     const { destFolderId, folderIds, fileIds } = operationData;
-    const { setBufferSelection, addActiveItems } = this.filesStore;
-
-    addActiveItems(fileIds);
-    addActiveItems(null, folderIds);
+    const { setBufferSelection } = this.filesStore;
 
     let conflicts;