Eolite 2.21: file selection fix

git-svn-id: svn://kolibrios.org@4861 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2014-04-20 09:52:52 +00:00
parent aaf67062bc
commit 0134b0c04a
2 changed files with 12 additions and 7 deletions

View File

@ -81,8 +81,8 @@
enum {ONLY_SHOW, WITH_REDRAW, ONLY_OPEN}; //OpenDir
#define TITLE "Eolite File Manager v2.2"
#define ABOUT_TITLE "Eolite v2.2"
#define TITLE "Eolite File Manager v2.21"
#define ABOUT_TITLE "Eolite v2.21"
dword col_padding, col_selec, col_lpanel;
int toolbar_buttons_x[7]={9,46,85,134,167,203};

View File

@ -49,7 +49,7 @@ void copyf_Draw_Progress(dword filename) {
if (CheckEvent()==evButton)
{
notify(T_CANCEL_PASTE);
ExitProcess();
CopyExit();
}
}
@ -64,7 +64,7 @@ void Paste()
tst = j*4096;
strlcpy(#copy_from, clipboard.GetSlotData(clipboard.GetSlotCount()-1)+8+tst, 4096);
debug(#copy_from);
if (!copy_from) ExitProcess();
if (!copy_from) CopyExit();
strcpy(#copy_to, #path);
strcat(#copy_to, #copy_from+strrchr(#copy_from,'/'));
if (!strcmp(#copy_from,#copy_to))
@ -76,7 +76,7 @@ void Paste()
if (strstr(#copy_to, #copy_from))
{
notify("Copy directory into itself is a bad idea...");
ExitProcess();
CopyExit();
}
if (copy_rezult = copyf(#copy_from,#copy_to))
{
@ -94,9 +94,14 @@ void Paste()
cut_active=false;
}
for (j = 0; j < MAX_HISTORY_NUM; j++) strcpy(#copy_path.copy_list[j].Item, 0);
action_buf = COPY_PASTE_END;
add_to_copy_active=0;
id_add_to_copy=0;
CopyExit();
}
void CopyExit()
{
action_buf = COPY_PASTE_END;
ActivateWindow(GetProcessSlot(Form.ID));
ExitProcess();
}