From 7d7d3e178a251bb3f23da0b62dae64bcf43b7331 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Sun, 10 Jan 2016 16:53:02 +0000 Subject: [PATCH] Eolite: remove code which automatically saved changes to /fd/1/ while app exit as it caused issue on some PCs git-svn-id: svn://kolibrios.org@6049 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/cmm/eolite/Eolite.c | 2 -- programs/cmm/eolite/include/left_panel.h | 1 - programs/cmm/eolite/include/settings.h | 26 +++++++++------------- programs/cmm/eolite/include/translations.h | 4 ++-- 4 files changed, 12 insertions(+), 21 deletions(-) diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c index f30fe7119c..75a18deaab 100644 --- a/programs/cmm/eolite/Eolite.c +++ b/programs/cmm/eolite/Eolite.c @@ -22,8 +22,6 @@ //patterns #include "..\lib\patterns\history.h" -byte CMD_ENABLE_SAVE_IMG = false; - //images #include "imgs\toolbar.txt" #include "imgs\left_p.txt" diff --git a/programs/cmm/eolite/include/left_panel.h b/programs/cmm/eolite/include/left_panel.h index d0bde0a9ea..554a3840f2 100644 --- a/programs/cmm/eolite/include/left_panel.h +++ b/programs/cmm/eolite/include/left_panel.h @@ -117,7 +117,6 @@ void _SystemDiscs::Get() if (temp_file_count) list.add("/kolibrios/"); free(tempbuf); } - else if (!strcmp(#sys_discs, "/fd/1/")) CMD_ENABLE_SAVE_IMG = true; } free(devbuf); } diff --git a/programs/cmm/eolite/include/settings.h b/programs/cmm/eolite/include/settings.h index 8a37123def..c0336e0d7a 100644 --- a/programs/cmm/eolite/include/settings.h +++ b/programs/cmm/eolite/include/settings.h @@ -44,7 +44,6 @@ void settings_dialog() else if (id==6) { ini_set_str stdcall (eolite_ini_path, #config_section, "DefaultPath", #path,strlen(#path)); - IF(CMD_ENABLE_SAVE_IMG)ini_set_str stdcall (fd_path_eolite_ini_path, #config_section, "DefaultPath", #path,strlen(#path)); break; } else if (id==20) show_dev_name ^= 1; @@ -116,24 +115,19 @@ void LoadIniSettings() if(!strcmp(#temp,"off")) label.smooth = false; else label.smooth = true; } -void ProceedSaveSettings(dword save_path) -{ - ini_set_int stdcall (save_path, #config_section, "ShowDeviceName", show_dev_name); - ini_set_int stdcall (save_path, #config_section, "RealFileNamesCase", real_files_names_case); - ini_set_int stdcall (save_path, #config_section, "InfoAfterCopy", info_after_copy); - ini_set_int stdcall (save_path, #config_section, "FontSize", label.size.pt); - ini_set_int stdcall (save_path, #config_section, "TwoPanels", two_panels); - ini_set_int stdcall (save_path, #config_section, "LineHeight", files.item_h); - ini_set_int stdcall (save_path, #config_section, "WinX", Form.left); - ini_set_int stdcall (save_path, #config_section, "WinY", Form.top); - ini_set_int stdcall (save_path, #config_section, "WinW", Form.width); - ini_set_int stdcall (save_path, #config_section, "WinH", Form.height); -} void SaveIniSettings() { - ProceedSaveSettings(eolite_ini_path); - if(CMD_ENABLE_SAVE_IMG) ProceedSaveSettings(fd_path_eolite_ini_path); + ini_set_int stdcall (eolite_ini_path, #config_section, "ShowDeviceName", show_dev_name); + ini_set_int stdcall (eolite_ini_path, #config_section, "RealFileNamesCase", real_files_names_case); + ini_set_int stdcall (eolite_ini_path, #config_section, "InfoAfterCopy", info_after_copy); + ini_set_int stdcall (eolite_ini_path, #config_section, "FontSize", label.size.pt); + ini_set_int stdcall (eolite_ini_path, #config_section, "TwoPanels", two_panels); + ini_set_int stdcall (eolite_ini_path, #config_section, "LineHeight", files.item_h); + ini_set_int stdcall (eolite_ini_path, #config_section, "WinX", Form.left); + ini_set_int stdcall (eolite_ini_path, #config_section, "WinY", Form.top); + ini_set_int stdcall (eolite_ini_path, #config_section, "WinW", Form.width); + ini_set_int stdcall (eolite_ini_path, #config_section, "WinH", Form.height); } diff --git a/programs/cmm/eolite/include/translations.h b/programs/cmm/eolite/include/translations.h index aec5c5ca89..f1d15696c6 100644 --- a/programs/cmm/eolite/include/translations.h +++ b/programs/cmm/eolite/include/translations.h @@ -1,5 +1,5 @@ -#define TITLE "Eolite File Manager v3.35" -#define ABOUT_TITLE "Eolite 3.35" +#define TITLE "Eolite File Manager v3.36" +#define ABOUT_TITLE "Eolite 3.36" #ifdef LANG_RUS ?define T_FILE "” ©«"