Sweetbread/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Issues Pull Requests Actions Activity

fix crash if close parent window when open child window

Browse Source 
git-svn-id: svn://kolibrios.org@7035 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
IgorA 2017-09-29 17:55:03 +00:00
parent 7f7bf0ddcf
commit 7cc546b610
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
programs/other/t_edit/t_button.inc
View File

@ -391,10 +391,11 @@ but_replace:
; äã­ªæ¨ï ¯®¨áª  ¨­ä®à¬ æ¨¨ ¢ ᯨ᪥ ª«î祢ëå á«®¢ ; äã­ªæ¨ï ¯®¨áª  ¨­ä®à¬ æ¨¨ ¢ ᯨ᪥ ª«î祢ëå á«®¢
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

8
programs/other/t_edit/t_edit.asm
View File

@ -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

6
programs/other/t_edit/wnd_k_words.inc
View File

@ -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 ;¯¥à¥¬¥­­ ï á«¥¤ïé ï §  ⥬ çâ®-¡ë ­¥ § ¯ã᪠âì ¡®«ìè¥ 1-£® ®ª­  ®¤­®¢à¥¬¥­­® wnd_k_words_run dd 0 ;¯¥à¥¬¥­­ ï á«¥¤ïé ï §  ⥬ çâ®-¡ë ­¥ § ¯ã᪠âì ¡®«ìè¥ 1-£® ®ª­  ®¤­®¢à¥¬¥­­®
if lang eq ru if lang eq ru
txt_caption db '<27>®¨áª ¢ ª«î祢ëå á«®¢ å',0 txt_caption db '<27>®¨áª ¢ ª«î祢ëå á«®¢ å',0
@ -21,7 +21,6 @@ align 4
prop_start: prop_start:
pushad pushad
mcall SF_SET_EVENTS_MASK,0xC0000027 ;¬ áª  ®¦¨¤ ¥¬ëå ᮡë⨩ mcall SF_SET_EVENTS_MASK,0xC0000027 ;¬ áª  ®¦¨¤ ¥¬ëå ᮡë⨩
inc byte[wnd_k_words_run]
;­ áâனª  ᯨ᪠ ®¡ê¥ªâ®¢ ;­ áâனª  ᯨ᪠ ®¡ê¥ªâ®¢
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 ;ãáâ ­®¢ª  á¨á⥬­ëå 梥⮢ edit_boxes_set_sys_color edit3,editboxes_end,sc ;ãáâ ­®¢ª  á¨á⥬­ëå 梥⮢
;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 ;ç¨á⨬ 㪠§ â¥«¨ ­  ¨ª®­ª¨ çâ®-¡ë ¨å ­¥ 㤠«¨« ¤¥áâàãªâ®à mov dword[tree3.data_img],0 ;ç¨á⨬ 㪠§ â¥«¨ ­  ¨ª®­ª¨ çâ®-¡ë ¨å ­¥ 㤠«¨« ¤¥áâàãªâ®à
mov dword[tree3.data_img_sys],0 ;â. ª. ®­¨ ¥é¥ ¨á¯®«ì§ãîâìáï ¢ ¤à㣨å í«¥¬¥­â å mov dword[tree3.data_img_sys],0 ;â. ª. ®­¨ ¥é¥ ¨á¯®«ì§ãîâìáï ¢ ¤à㣨å í«¥¬¥­â å
stdcall dword[tl_data_clear], tree3 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 mcall SF_TERMINATE_PROCESS
align 4 align 4