From 52d53bf71fae59c684fe21fc82da5dfff9b49ec3 Mon Sep 17 00:00:00 2001 From: Serhii Sakhno Date: Wed, 2 Mar 2016 17:44:25 +0000 Subject: [PATCH] Eolite: inproperly operate the buttons in the delete dialog - fix 2 git-svn-id: svn://kolibrios.org@6300 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/cmm/eolite/Eolite.c | 5 ++--- programs/cmm/eolite/include/about.h | 2 +- programs/cmm/eolite/include/delete.h | 1 + 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c index cbbdb2f0a9..e12a8e3c98 100644 --- a/programs/cmm/eolite/Eolite.c +++ b/programs/cmm/eolite/Eolite.c @@ -337,9 +337,8 @@ void main() case 100...120: SystemDiscs.Click(id-100); break; - case POPUP_BTN1: - case POPUP_BTN2: - if (del_active) Del_File(id-POPUP_BTN1); + case POPUP_BTN1...POPUP_BTN2: + if (del_active) Del_File(id-POPUP_BTN2); if (new_element_active) NewElement(id-POPUP_BTN2); DeleteButton(POPUP_BTN1); DeleteButton(POPUP_BTN2); diff --git a/programs/cmm/eolite/include/about.h b/programs/cmm/eolite/include/about.h index 4624006947..43007625f4 100644 --- a/programs/cmm/eolite/include/about.h +++ b/programs/cmm/eolite/include/about.h @@ -43,7 +43,7 @@ void about_dialog() WriteTextB(about_x+2,107,0x82,0xD49CD2,ABOUT_TITLE); WriteTextB(about_x,105,0x82,0x9D129D,ABOUT_TITLE); DrawRectangle3D(0,154,about_form.cwidth,1,system.color.work_dark,system.color.work_light); - WriteTextLines(7,163,0x90,system.color.work_text,"KolibriOS File Manager\nAuthors: Leency, Veliant\nPunkJoker, Pavelyakov\n(c) 2008 - 2016",20); + WriteTextLines(7,163,0x90,system.color.work_text,"KolibriOS File Manager\nAuthors: Leency, Veliant\nPunk_Joker, Pavelyakov\n(c) 2008 - 2016",20); #ifdef LANG_RUS DrawFlatButton(about_form.cwidth-180/2,about_form.cheight-38,180,26,11,"История разработки"); #endif diff --git a/programs/cmm/eolite/include/delete.h b/programs/cmm/eolite/include/delete.h index 18fd502b23..323e73d358 100644 --- a/programs/cmm/eolite/include/delete.h +++ b/programs/cmm/eolite/include/delete.h @@ -81,6 +81,7 @@ void Del_File_Thread() void Del_File(byte dodel) { del_active=0; + debugi(dodel); if (dodel) { delete_stak = malloc(40000);