M#2976: У arclite не работает режим Store для 7z из командной строки

M#3074: VS14 build issue - string literals issue
FarGroup · Sep 18, 2015 · bc5d363 · bc5d363
1 parent b312472
commit bc5d363
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/plugins/arclite/changelog b/plugins/arclite/changelog
@@ -1,3 +1,9 @@
+w17 18.09.2015 22:29:41 +0300 - build 202
+
+- M#2976: � arclite �� �������� ����� Store ��� 7z �� ��������� ������
+- M#3074: VS14 build issue - string literals issue
+- ������ 1.6.12.
+
 w17 11.09.2015 13:55:25 +0300 - build 201
 
 - ��������� ��� 7z.dll > 9.26 (M#3040, M#3069)

diff --git a/plugins/arclite/cmdline.cpp b/plugins/arclite/cmdline.cpp
@@ -280,6 +280,10 @@ UpdateCommand parse_update_command(const CommandArgs& ca) {
     else
       command.files.push_back(unquote(args[i]));
   }
+
+  if (command.options.level == 0)
+    command.options.method = c_method_copy;
+
   return command;
 }
 

diff --git a/plugins/arclite/options.cpp b/plugins/arclite/options.cpp
@@ -110,7 +110,7 @@ Options::Options():
 
 void load_sfx_options(OptionsKey& key, SfxOptions& sfx_options) {
   SfxOptions def_sfx_options;
-#define GET_VALUE(name, type) sfx_options.name = key.get_##type(L"sfx."L#name, def_sfx_options.name)
+#define GET_VALUE(name, type) sfx_options.name = key.get_##type(L"sfx." L#name, def_sfx_options.name)
   GET_VALUE(name, str);
   GET_VALUE(replace_icon, bool);
   GET_VALUE(icon_path, str);
@@ -134,7 +134,7 @@ void load_sfx_options(OptionsKey& key, SfxOptions& sfx_options) {
 
 void save_sfx_options(OptionsKey& key, const SfxOptions& sfx_options) {
   SfxOptions def_sfx_options;
-#define SET_VALUE(name, type) key.set_##type(L"sfx."L#name, sfx_options.name, def_sfx_options.name)
+#define SET_VALUE(name, type) key.set_##type(L"sfx." L#name, sfx_options.name, def_sfx_options.name)
   SET_VALUE(name, str);
   SET_VALUE(replace_icon, bool);
   SET_VALUE(icon_path, str);

diff --git a/plugins/arclite/project.ini b/plugins/arclite/project.ini
@@ -2,4 +2,4 @@
 MODULE = arclite
 VER_MAJOR = 1
 VER_MINOR = 6
-VER_PATCH = 11
+VER_PATCH = 12
diff --git a/plugins/arclite/ui.cpp b/plugins/arclite/ui.cpp
@@ -765,7 +765,7 @@ class UpdateDialog: public Far::Dialog {
         flu.Index = i;
         flu.Item.Flags = skip ? LIF_DISABLE : 0;
         flu.Item.Text = Far::msg_ptr(c_levels[i].name_id);
-        CHECK(send_message(DM_LISTUPDATE, level_ctrl_id, &flu));
+        send_message(DM_LISTUPDATE, level_ctrl_id, &flu);
       }
       if (new_level_sel == -1 && c_levels[i].value == 5) {
         new_level_sel = i;