From 8819a40f56ff2a3a1e1babc453805f0bdd60694f Mon Sep 17 00:00:00 2001
From: CleverMouse <theclevermouse@yandex.ru>
Date: Mon, 14 Jan 2013 09:26:21 +0000
Subject: [PATCH] fix errors in error handling for copy operations

git-svn-id: svn://kolibrios.org@3165 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/fs/kfar/trunk/filetool.inc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/programs/fs/kfar/trunk/filetool.inc b/programs/fs/kfar/trunk/filetool.inc
index 0ac2ef4c78..537c73450b 100644
--- a/programs/fs/kfar/trunk/filetool.inc
+++ b/programs/fs/kfar/trunk/filetool.inc
@@ -488,7 +488,9 @@ copy_file_worker2:
         popf
         jmp     .ret
 .copyfailed:
+        pop     eax
         pop     ecx
+        push    eax
         test    ecx, ecx
         jnz     @f
         mov     eax, [source_hModule]
@@ -848,8 +850,7 @@ copy_file:
 .cancel.ret:
         xor     eax, eax
         inc     eax
-        popad
-        ret
+        jmp     .done
 
 delete_last_name_from_end:
         lodsb