fixes gh-401: zip compression without dialog follows the last settings stored in dialog

Author: sebres

CPP/7zip/UI/Common/CompressCall.cpp

@@ -217,7 +217,7 @@ HRESULT CompressFiles(
   params += kIncludeSwitch;
   RINOK(CreateMap(names, fileMapping, event, params))
 
-  if (!arcType.IsEmpty() && arcType == L"7z")
+  if (!arcType.IsEmpty() && ((arcType == L"7z") || (arcType == L"zip")))
   {
     int index;
     params += kArchiveTypeSwitch;
@@ -231,7 +231,7 @@ HRESULT CompressFiles(
 
       if (!fo.Method.IsEmpty())
       {
-        params += " -m0=";
+        params += (arcType == L"7z") ? " -m0=" : " -mm=";
         params += fo.Method;
       }
 
@@ -242,23 +242,23 @@ HRESULT CompressFiles(
         params += temp;
       }
 
-      if (fo.Dictionary)
+      if (fo.Dictionary && (arcType == L"7z"))
       {
         params += " -md=";
         ConvertUInt32ToString(fo.Dictionary, temp);
         params += temp;
         params += "b";
       }
 
-      if (fo.BlockLogSize)
+      if (fo.BlockLogSize && (arcType == L"7z"))
       {
         params += " -ms=";
         ConvertUInt64ToString(1ULL << fo.BlockLogSize, temp);
         params += temp;
         params += "b";
       }
 
-      if (fo.NumThreads)
+      if (fo.NumThreads && fo.NumThreads != -1)
       {
         params += " -mmt=";
         ConvertUInt32ToString(fo.NumThreads, temp);