diff --git a/programs/cmm/eolite/include/copy_and_delete.h b/programs/cmm/eolite/include/copy_and_delete.h index b8472bf578..223e09d814 100644 --- a/programs/cmm/eolite/include/copy_and_delete.h +++ b/programs/cmm/eolite/include/copy_and_delete.h @@ -135,8 +135,9 @@ void PasteThread() strcpy(#copy_from, path_offset); if (!copy_from) DialogExit(); sprintf(#copy_to, "%s/%s", #path, #copy_from+strrchr(#copy_from,'/')); - if (!strcmp(#copy_from,#copy_to)) + if (streq(#copy_from,#copy_to)) { + if (cut_active) continue; sprintf(#copy_to, "%s/NEW_%s", #path, #copy_from+strrchr(#copy_from,'/')); } if (strstr(#copy_to, #copy_from)) diff --git a/programs/develop/tinypad/trunk/tinypad.asm b/programs/develop/tinypad/trunk/tinypad.asm index 74ecaecab4..1893430fd9 100644 --- a/programs/develop/tinypad/trunk/tinypad.asm +++ b/programs/develop/tinypad/trunk/tinypad.asm @@ -413,9 +413,9 @@ proc load_settings ;////////////////////////////////////////////////////////// mov [mainwnd_pos.x],eax invoke ini.get_int,ini_path,ini_sec_window,ini_window_top,75 mov [mainwnd_pos.y],eax - invoke ini.get_int,ini_path,ini_sec_window,ini_window_width,6*80+6+SCRLW+5 + invoke ini.get_int,ini_path,ini_sec_window,ini_window_width,615;8*80+6+SCRLW+5 mov [mainwnd_pos.w],eax - invoke ini.get_int,ini_path,ini_sec_window,ini_window_height,402 + invoke ini.get_int,ini_path,ini_sec_window,ini_window_height,615 mov [mainwnd_pos.h],eax popad diff --git a/programs/testing/cpuid/trunk/CPUID.ASM b/programs/testing/cpuid/trunk/CPUID.ASM index 746664791a..c75150fe71 100644 --- a/programs/testing/cpuid/trunk/CPUID.ASM +++ b/programs/testing/cpuid/trunk/CPUID.ASM @@ -3022,7 +3022,7 @@ load_gif: ; DATA AREA -title db 'CPUID 2.31',0 +title db 'CPUID 2.31 by S.Kuzmin & KolibriOS Team',0 stm: db 'Internal name:', 0