From 3958c19fa5d573815d5dc29613c391ddd2ea7520 Mon Sep 17 00:00:00 2001
From: Marat Zakiyanov <mario79@bk.ru>
Date: Wed, 30 Mar 2022 21:55:55 +0000
Subject: [PATCH] KFM - fixed get_inf_dir and delete_dir for some cases

git-svn-id: svn://kolibrios.org@9754 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/fs/kfm/trunk/delete.inc   | 14 ++++++++------
 programs/fs/kfm/trunk/file_inf.inc |  6 ++++--
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/programs/fs/kfm/trunk/delete.inc b/programs/fs/kfm/trunk/delete.inc
index a0f3331aad..de49a8be06 100644
--- a/programs/fs/kfm/trunk/delete.inc
+++ b/programs/fs/kfm/trunk/delete.inc
@@ -188,11 +188,11 @@ delete_dir:
     call start_error_window_thread
     popa
     add  esp,8+4
-    ret
+    jmp  still
 @@:
     mov  eax,[delete_dir_data+8]
-    cmp  eax,2
-    ja	 @f
+    test eax,eax
+    jnz  @f
     inc  [current_progress_value]
     call progress_bar_delete
     call del_file
@@ -202,7 +202,7 @@ delete_dir:
     call start_error_window_thread
     popa
     add  esp,8+4
-    ret
+    jmp  still
 @@:
     imul  eax,304
     add   eax,32
@@ -226,7 +226,7 @@ delete_dir:
     call start_error_window_thread
     popa
     add  esp,8+4
-    ret
+    jmp  still
 @@:
     call delete_dir_1
     jc	.1
@@ -249,6 +249,8 @@ delete_dir_1:
     mov  ebp,[appl_memory_old]
     mov  ebp,[ebp+8]
 .start:
+    test ebp,ebp
+    jz   .continue_4
     mov  ebx,ebp
     dec  ebx
     imul ebx,304
@@ -298,7 +300,7 @@ delete_dir_1:
     popa
     add  esp,8+4
     ret
-.continue_2:        
+.continue_2:
     clc
     ret
 .continue_3:
diff --git a/programs/fs/kfm/trunk/file_inf.inc b/programs/fs/kfm/trunk/file_inf.inc
index 81023c9ace..9a6556feb9 100644
--- a/programs/fs/kfm/trunk/file_inf.inc
+++ b/programs/fs/kfm/trunk/file_inf.inc
@@ -463,7 +463,7 @@ get_inf_dir:
 	call	start_error_window_thread
 	popa
 	add	esp,8+8
-	ret
+	jmp	still
 ;--------------------------------------
 @@:
 	mov	eax,[delete_dir_data+8]
@@ -492,7 +492,7 @@ get_inf_dir:
 	call	start_error_window_thread
 	popa
 	add	esp,8+8
-	ret
+	jmp	still
 ;--------------------------------------
 @@:
 	cmp	[nesting_direction],0
@@ -541,6 +541,8 @@ get_inf_dir_1:
 	mov	ebp,[ebp+8]
 ;--------------------------------------
 .start:
+	test	ebp,ebp
+	jz	.continue_4
 	mov	ebx,ebp
 	dec	ebx
 	imul	ebx,304