forked from KolibriOS/kolibrios
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:
@@ -391,10 +391,11 @@ but_replace:
|
|||||||
; <EFBFBD>㭪<EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD>᪠ <EFBFBD><EFBFBD><EFBFBD><EFBFBD>ଠ樨 <EFBFBD> ᯨ᪥ <EFBFBD><EFBFBD><EFBFBD>祢<EFBFBD><EFBFBD> <EFBFBD>
|
; <EFBFBD>㭪<EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD>᪠ <EFBFBD><EFBFBD><EFBFBD><EFBFBD>ଠ樨 <EFBFBD> ᯨ᪥ <EFBFBD><EFBFBD><EFBFBD>祢<EFBFBD><EFBFBD> <EFBFBD>
|
||||||
align 4
|
align 4
|
||||||
but_find_key_w:
|
but_find_key_w:
|
||||||
cmp byte[wnd_k_words_run],0
|
cmp dword[wnd_k_words_run],0
|
||||||
jne @f
|
jne @f
|
||||||
pushad
|
pushad
|
||||||
mcall SF_CREATE_THREAD,1,prop_start,thread_coords
|
mcall SF_CREATE_THREAD,1,prop_start,thread_coords
|
||||||
|
mov dword[wnd_k_words_run],eax
|
||||||
popad
|
popad
|
||||||
@@:
|
@@:
|
||||||
ret
|
ret
|
||||||
|
@@ -500,6 +500,14 @@ button:
|
|||||||
|
|
||||||
jmp still
|
jmp still
|
||||||
.exit:
|
.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
|
cmp dword[exit_code],1
|
||||||
je @f
|
je @f
|
||||||
stdcall [ted_can_save], tedit0
|
stdcall [ted_can_save], tedit0
|
||||||
|
@@ -8,7 +8,7 @@ SIZE_ONE_FLOAT equ 14
|
|||||||
|
|
||||||
IMAGE_TOOLBAR_ICON_SIZE equ 20*20*3
|
IMAGE_TOOLBAR_ICON_SIZE equ 20*20*3
|
||||||
|
|
||||||
wnd_k_words_run db 0 ;<EFBFBD><EFBFBD>६<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD> ⥬ <EFBFBD><EFBFBD><EFBFBD>-<EFBFBD><EFBFBD> <EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD>᪠<EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 1-<EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>६<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
wnd_k_words_run dd 0 ;<EFBFBD><EFBFBD>६<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD> ⥬ <EFBFBD><EFBFBD><EFBFBD>-<EFBFBD><EFBFBD> <EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD>᪠<EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 1-<EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>६<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
|
|
||||||
if lang eq ru
|
if lang eq ru
|
||||||
txt_caption db '<27><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD>祢<EFBFBD><E7A5A2> <><E1ABAE><EFBFBD>',0
|
txt_caption db '<27><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD>祢<EFBFBD><E7A5A2> <><E1ABAE><EFBFBD>',0
|
||||||
@@ -21,7 +21,6 @@ align 4
|
|||||||
prop_start:
|
prop_start:
|
||||||
pushad
|
pushad
|
||||||
mcall SF_SET_EVENTS_MASK,0xC0000027 ;<EFBFBD><EFBFBD>᪠ <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ᮡ<EFBFBD>⨩
|
mcall SF_SET_EVENTS_MASK,0xC0000027 ;<EFBFBD><EFBFBD>᪠ <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ᮡ<EFBFBD>⨩
|
||||||
inc byte[wnd_k_words_run]
|
|
||||||
|
|
||||||
;<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ன<EFBFBD><EFBFBD> ᯨ᪠ <EFBFBD><EFBFBD>ꥪ⮢
|
;<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ன<EFBFBD><EFBFBD> ᯨ᪠ <EFBFBD><EFBFBD>ꥪ⮢
|
||||||
mov dword[tree3.info_max_count],2
|
mov dword[tree3.info_max_count],2
|
||||||
@@ -35,7 +34,6 @@ pushad
|
|||||||
mov dword[tree3.data_img_sys],eax
|
mov dword[tree3.data_img_sys],eax
|
||||||
|
|
||||||
edit_boxes_set_sys_color edit3,editboxes_end,sc ;<EFBFBD><EFBFBD>⠭<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD>⥬<EFBFBD><EFBFBD><EFBFBD> 梥⮢
|
edit_boxes_set_sys_color edit3,editboxes_end,sc ;<EFBFBD><EFBFBD>⠭<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD>⥬<EFBFBD><EFBFBD><EFBFBD> 梥⮢
|
||||||
;stdcall [edit_box_set_text], edit3, txt_q
|
|
||||||
popad
|
popad
|
||||||
|
|
||||||
align 4
|
align 4
|
||||||
@@ -96,7 +94,7 @@ prop_still:
|
|||||||
mov dword[tree3.data_img],0 ;<EFBFBD><EFBFBD><EFBFBD>⨬ 㪠<EFBFBD><EFBFBD>⥫<EFBFBD> <EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD>-<EFBFBD><EFBFBD> <EFBFBD><EFBFBD> <EFBFBD><EFBFBD> 㤠<EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
mov dword[tree3.data_img],0 ;<EFBFBD><EFBFBD><EFBFBD>⨬ 㪠<EFBFBD><EFBFBD>⥫<EFBFBD> <EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD>-<EFBFBD><EFBFBD> <EFBFBD><EFBFBD> <EFBFBD><EFBFBD> 㤠<EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
mov dword[tree3.data_img_sys],0 ;<EFBFBD>. <EFBFBD>. <EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD> <EFBFBD>ᯮ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD> <EFBFBD><EFBFBD>㣨<EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
mov dword[tree3.data_img_sys],0 ;<EFBFBD>. <EFBFBD>. <EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD> <EFBFBD>ᯮ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD> <EFBFBD><EFBFBD>㣨<EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
stdcall dword[tl_data_clear], tree3
|
stdcall dword[tl_data_clear], tree3
|
||||||
mov byte[wnd_k_words_run],0 ;<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>塞 <EFBFBD><EFBFBD><EFBFBD><EFBFBD>稪 <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
mov dword[wnd_k_words_run],0 ;<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>塞 ID <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
mcall SF_TERMINATE_PROCESS
|
mcall SF_TERMINATE_PROCESS
|
||||||
|
|
||||||
align 4
|
align 4
|
||||||
|
Reference in New Issue
Block a user