fix 4957

FarGroup · May 14, 2017 · d57d036 · d57d036
1 parent ce9f381
commit d57d036
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/far/changelog b/far/changelog
@@ -1,3 +1,7 @@
+drkns 14.05.2017 20:32:53 +0000 - build 4960
+
+1. Уточнение 4957.
+
 drkns 14.05.2017 20:09:37 +0000 - build 4959
 
 1. Расширим немного Adapter API:

diff --git a/far/delete.cpp b/far/delete.cpp
@@ -213,7 +213,9 @@ static bool MoveToRecycleBinInternal(const string& Objects)
 	if (Result == ERROR_ACCESS_DENIED && Global->Opt->ElevationMode&ELEVATION_MODIFY_REQUEST) // Achtung! ShellAPI doesn't set LastNtStatus, so don't use ElevationRequired() here.
 		Result = SHErrorToWinError(elevation::instance().fMoveToRecycleBin(fop));
 
-	return !Result && !fop.fAnyOperationsAborted;
+	SetLastError(Result);
+
+	return Result == ERROR_SUCCESS && !fop.fAnyOperationsAborted;
 }
 
 static bool WipeFileData(const string& Name, int TotalPercent, bool& Cancel)

diff --git a/far/vbuild.m4 b/far/vbuild.m4
@@ -1 +1 @@
-m4_define(BUILD,4959)m4_dnl
+m4_define(BUILD,4960)m4_dnl