From ce3c40a673f1bb2104f83db26c1e4e2467abcfe2 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Thu, 11 Oct 2018 11:02:39 +0000 Subject: [PATCH] searchap: first mount attempt without delay, second mount attempt with delay (default 5 seconds); by Mario request git-svn-id: svn://kolibrios.org@7449 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/develop/h2d2b/trunk/h2d2b.asm | 2 +- programs/system/searchap/searchap.asm | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/programs/develop/h2d2b/trunk/h2d2b.asm b/programs/develop/h2d2b/trunk/h2d2b.asm index 9f951ea133..2d6437dc98 100644 --- a/programs/develop/h2d2b/trunk/h2d2b.asm +++ b/programs/develop/h2d2b/trunk/h2d2b.asm @@ -282,7 +282,7 @@ else end if mouse_dd dd 0 -edit1 edit_box (WIN_W-67-82), 67, 146, 0xffffff, 0xff, 0x80ff, 0, 0x90000000, (string1_end-string1), string1 , mouse_dd, ed_focus+ed_always_focus+ed_figure_only +edit1 edit_box (WIN_W-67-82), 67, 146, 0xffffff, 0xff, 0x80ff, 0, 0x90000000, (string1_end-string1), string1 , mouse_dd, ed_focus+ed_always_focus editboxes_end: diff --git a/programs/system/searchap/searchap.asm b/programs/system/searchap/searchap.asm index af98570a27..3eca7d51bc 100644 --- a/programs/system/searchap/searchap.asm +++ b/programs/system/searchap/searchap.asm @@ -37,7 +37,8 @@ params dd PARAMS dd 0x0 ;--------------------------------------------------------------------- -delay dd 0;500 +delay dd 500 +mount_attempt dd 0 ;--------------------------------------------------------------------- fileinfo: .subfunction dd 5 @@ -106,7 +107,7 @@ START: mov [delay], ecx .params_done: ;-------------------------------------- - mcall 5,[delay] + ;mcall 5,[delay] ;first mount attempt without delay mov ebx,start_dir mov ax,[ebx] mov ebx,read_folder_name @@ -131,6 +132,14 @@ exit: ;-------------------------------------- DEBUGF 1, "Searchap: just exit\n" ;-------------------------------------- + cmp [mount_dir],1 + je @f + cmp [mount_attempt], 1 + je @f + mov [mount_attempt], 1 ;second mount attempt with delay + mcall 5,[delay] + jmp START.params_done +terminate: mcall -1 ;--------------------------------------------------------------------- device_detect_f70: