fix errors in error handling for copy operations

git-svn-id: svn://kolibrios.org@3165 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-01-14 09:26:21 +00:00 · 2013-01-14 09:26:21 +00:00 · 8819a40f56
commit 8819a40f56
parent de94fe74ac
1 changed files with 3 additions and 2 deletions
--- 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