Fix #24, which happens on first time calls via Explorer menu :/

mcmilk · Jul 16, 2017 · b786c47 · b786c47
1 parent 5464703
commit b786c47
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/C/7zVersion.h b/C/7zVersion.h
@@ -1,7 +1,7 @@
 #define MY_VER_MAJOR 17
 #define MY_VER_MINOR 00
 #define MY_VER_BUILD 0
-#define MY_VERSION_NUMBERS "17.00 ZS v1.3.0 R1"
+#define MY_VERSION_NUMBERS "17.00 ZS v1.3.0 R2"
 #define MY_VERSION MY_VERSION_NUMBERS
 
 #ifdef MY_CPU_NAME
@@ -10,7 +10,7 @@
   #define MY_VERSION_CPU MY_VERSION
 #endif
 
-#define MY_DATE "2017-07-11"
+#define MY_DATE "2017-07-16"
 #undef MY_COPYRIGHT
 #undef MY_VERSION_COPYRIGHT_DATE
 #define MY_AUTHOR_NAME "Igor Pavlov, Tino Reichardt"

diff --git a/C/7zVersionTr.h b/C/7zVersionTr.h
@@ -1,9 +1,9 @@
 #define MY_VER_MAJOR 1
 #define MY_VER_MINOR 3
 #define MY_VER_BUILD 0
-#define MY_VERSION_NUMBERS "1.3.0 R1"
+#define MY_VERSION_NUMBERS "1.3.0 R2"
 #define MY_VERSION         MY_VERSION_NUMBERS
-#define MY_DATE            "2017-07-11"
+#define MY_DATE            "2017-07-16"
 #undef MY_COPYRIGHT
 #undef MY_VERSION_COPYRIGHT_DATE
 #define MY_AUTHOR_NAME     "Tino Reichardt"

diff --git a/CPP/7zip/UI/Common/CompressCall.cpp b/CPP/7zip/UI/Common/CompressCall.cpp
@@ -228,14 +228,17 @@ HRESULT CompressFiles(
     {
       char temp[32];
       const NCompression::CFormatOptions &fo = m_RegistryInfo.Formats[index];
-      params += " -m0=";
-      params += fo.Method;
-      params += " -mx";
-      ConvertUInt64ToString(fo.Level, temp);
-      params += temp;
-      if (fo.NumThreads)
+
+      if (!fo.Method.IsEmpty())
       {
-        params += " -mmt";
+        params += " -m0=";
+        params += fo.Method;
+
+        params += " -mx=";
+        ConvertUInt64ToString(fo.Level, temp);
+        params += temp;
+
+        params += " -mmt=";
         ConvertUInt64ToString(fo.NumThreads, temp);
         params += temp;
       }