Merge pull request #349 from sebres/fix-set-common-props

Fix setting of common properties (`-mmt=n` option is ignored by many handlers)
mcmilk · Sep 6, 2023 · 3de9e01 · 3de9e01
2 parents 8f52579 + a884f29
commit 3de9e01
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/CPP/7zip/Archive/Common/HandlerOut.cpp b/CPP/7zip/Archive/Common/HandlerOut.cpp
@@ -203,8 +203,9 @@ HRESULT CMultiMethodProps::SetProperty(const wchar_t *nameSpec, const PROPVARIAN
 
   {
     HRESULT hres;
-    if (SetCommonProperty(name, value, hres))
-      return hres;
+    SetCommonProperty(name, value, hres);
+    /* don't return here, since many handlers set common properties (e. g. kNumThreads)
+       with SetCoderProperties, so add it also as prop by its ID from name below */
   }
 
   UInt32 number;
@@ -258,11 +259,9 @@ HRESULT CSingleMethodProps::SetProperty(const wchar_t *name2, const PROPVARIANT
   }
   {
     HRESULT hres;
-    if (SetCommonProperty(name, value, hres))
-    {
-      // processed = true;
-      return S_OK;
-    }
+    SetCommonProperty(name, value, hres);
+    /* don't return here, since many handlers set common properties (e. g. kNumThreads)
+       with SetCoderProperties, so add it also as prop by its ID from name below */
   }
   RINOK(ParseMethodFromPROPVARIANT(name, value));
   return S_OK;