mirror of
https://github.com/KolibriOS/kolibrios.git
synced 2024-12-25 16:16:50 +03:00
fix crash if close parent window when open child window
git-svn-id: svn://kolibrios.org@7035 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
parent
7f7bf0ddcf
commit
7cc546b610
@ -391,10 +391,11 @@ but_replace:
|
||||
; äãªæ¨ï ¯®¨áª ¨ä®à¬ 樨 ¢ ᯨ᪥ ª«î祢ëå á«®¢
|
||||
align 4
|
||||
but_find_key_w:
|
||||
cmp byte[wnd_k_words_run],0
|
||||
cmp dword[wnd_k_words_run],0
|
||||
jne @f
|
||||
pushad
|
||||
mcall SF_CREATE_THREAD,1,prop_start,thread_coords
|
||||
mov dword[wnd_k_words_run],eax
|
||||
popad
|
||||
@@:
|
||||
ret
|
||||
|
@ -500,6 +500,14 @@ button:
|
||||
|
||||
jmp still
|
||||
.exit:
|
||||
cmp dword[wnd_k_words_run],0
|
||||
je @f
|
||||
push ebx ecx
|
||||
mcall SF_SYSTEM, SSF_TERMINATE_THREAD_ID,[wnd_k_words_run]
|
||||
pop ecx ebx
|
||||
test eax,eax
|
||||
jnz still
|
||||
@@:
|
||||
cmp dword[exit_code],1
|
||||
je @f
|
||||
stdcall [ted_can_save], tedit0
|
||||
|
@ -8,7 +8,7 @@ SIZE_ONE_FLOAT equ 14
|
||||
|
||||
IMAGE_TOOLBAR_ICON_SIZE equ 20*20*3
|
||||
|
||||
wnd_k_words_run db 0 ;¯¥à¥¬¥ ï á«¥¤ïé ï § ⥬ çâ®-¡ë ¥ § ¯ã᪠âì ¡®«ìè¥ 1-£® ®ª ®¤®¢à¥¬¥®
|
||||
wnd_k_words_run dd 0 ;¯¥à¥¬¥ ï á«¥¤ïé ï § ⥬ çâ®-¡ë ¥ § ¯ã᪠âì ¡®«ìè¥ 1-£® ®ª ®¤®¢à¥¬¥®
|
||||
|
||||
if lang eq ru
|
||||
txt_caption db '<27>®¨áª ¢ ª«î祢ëå á«®¢ å',0
|
||||
@ -21,7 +21,6 @@ align 4
|
||||
prop_start:
|
||||
pushad
|
||||
mcall SF_SET_EVENTS_MASK,0xC0000027 ;¬ ᪠®¦¨¤ ¥¬ëå ᮡë⨩
|
||||
inc byte[wnd_k_words_run]
|
||||
|
||||
; áâனª ᯨ᪠®¡ê¥ªâ®¢
|
||||
mov dword[tree3.info_max_count],2
|
||||
@ -35,7 +34,6 @@ pushad
|
||||
mov dword[tree3.data_img_sys],eax
|
||||
|
||||
edit_boxes_set_sys_color edit3,editboxes_end,sc ;ãáâ ®¢ª á¨á⥬ëå 梥⮢
|
||||
;stdcall [edit_box_set_text], edit3, txt_q
|
||||
popad
|
||||
|
||||
align 4
|
||||
@ -96,7 +94,7 @@ prop_still:
|
||||
mov dword[tree3.data_img],0 ;ç¨á⨬ 㪠§ ⥫¨ ¨ª®ª¨ çâ®-¡ë ¨å ¥ 㤠«¨« ¤¥áâàãªâ®à
|
||||
mov dword[tree3.data_img_sys],0 ;â. ª. ®¨ ¥é¥ ¨á¯®«ì§ãîâìáï ¢ ¤à㣨å í«¥¬¥â å
|
||||
stdcall dword[tl_data_clear], tree3
|
||||
mov byte[wnd_k_words_run],0 ;®¡ã«ï¥¬ áç¥â稪 ®ª®
|
||||
mov dword[wnd_k_words_run],0 ;®¡ã«ï¥¬ ID ®ª
|
||||
mcall SF_TERMINATE_PROCESS
|
||||
|
||||
align 4
|
||||
|
Loading…
Reference in New Issue
Block a user