small fixes

git-svn-id: svn://kolibrios.org@8015 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2020-06-01 18:18:22 +00:00
parent 4b8e0542e3
commit fd10632095
3 changed files with 5 additions and 4 deletions

View File

@ -135,8 +135,9 @@ void PasteThread()
strcpy(#copy_from, path_offset); strcpy(#copy_from, path_offset);
if (!copy_from) DialogExit(); if (!copy_from) DialogExit();
sprintf(#copy_to, "%s/%s", #path, #copy_from+strrchr(#copy_from,'/')); 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,'/')); sprintf(#copy_to, "%s/NEW_%s", #path, #copy_from+strrchr(#copy_from,'/'));
} }
if (strstr(#copy_to, #copy_from)) if (strstr(#copy_to, #copy_from))

View File

@ -413,9 +413,9 @@ proc load_settings ;//////////////////////////////////////////////////////////
mov [mainwnd_pos.x],eax mov [mainwnd_pos.x],eax
invoke ini.get_int,ini_path,ini_sec_window,ini_window_top,75 invoke ini.get_int,ini_path,ini_sec_window,ini_window_top,75
mov [mainwnd_pos.y],eax 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 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 mov [mainwnd_pos.h],eax
popad popad

View File

@ -3022,7 +3022,7 @@ load_gif:
; DATA AREA ; DATA AREA
title db 'CPUID 2.31',0 title db 'CPUID 2.31 by S.Kuzmin & KolibriOS Team',0
stm: stm:
db 'Internal name:', 0 db 'Internal name:', 0