From bde6d41e51074088db39bc54bf4f6592988295d0 Mon Sep 17 00:00:00 2001 From: Serhii Sakhno Date: Wed, 16 Oct 2013 21:03:17 +0000 Subject: [PATCH] Eolite v1.98.7: you can only run one window "About Eolite" git-svn-id: svn://kolibrios.org@4040 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/cmm/eolite/Eolite.c | 6 ++++-- programs/cmm/eolite/include/about_dialog.h | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c index 6ce20b3aa9..28082cd8a3 100644 --- a/programs/cmm/eolite/Eolite.c +++ b/programs/cmm/eolite/Eolite.c @@ -76,8 +76,8 @@ enum {ONLY_SHOW, WITH_REDRAW, ONLY_OPEN}; //OpenDir -#define TITLE "Eolite File Manager v1.98.6" -#define ABOUT_TITLE "Eolite v1.98.6" +#define TITLE "Eolite File Manager v1.98.7" +#define ABOUT_TITLE "Eolite v1.98.7" dword col_work = 0xE4DFE1; dword col_border = 0x9098B0; //A0A0B8; //0x819FC5; dword col_padding = 0xC8C9C9; @@ -88,6 +88,8 @@ int toolbar_buttons_x[7]={9,46,85,134,167,203}; char tmp_disk_del_param[3]="d0"; struct path_string { char Item[4096]; }; +int active_about=0; + llist files; byte diff --git a/programs/cmm/eolite/include/about_dialog.h b/programs/cmm/eolite/include/about_dialog.h index 1b31afe7c6..322d1453f7 100644 --- a/programs/cmm/eolite/include/about_dialog.h +++ b/programs/cmm/eolite/include/about_dialog.h @@ -24,16 +24,26 @@ void about_dialog() { byte id; + IF (active_about) ExitProcess(); + active_about=1; loop() switch(WaitEvent()) { case evButton: id=GetButtonID(); - IF (id==1) || (id==10) ExitProcess(); + IF (id==1) || (id==10) + { + active_about=0; + ExitProcess(); + } IF (id==23) RunProgram(BROWSER_PATH, BROWSER_LINK); break; case evKey: - IF (GetKey()==27) ExitProcess(); + IF (GetKey()==27) + { + active_about=0; + ExitProcess(); + } break; case evReDraw: