From 5cc7816bb059e7a6797dffb2f9c8b608ab4af1c2 Mon Sep 17 00:00:00 2001 From: Anuskuss Date: Tue, 30 Apr 2024 04:37:04 +0200 Subject: [PATCH] Don't override user preference in unrar --- daemon/postprocess/DirectUnpack.cpp | 2 +- daemon/postprocess/Unpack.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/daemon/postprocess/DirectUnpack.cpp b/daemon/postprocess/DirectUnpack.cpp index defe2b9b5..9d66fbffc 100644 --- a/daemon/postprocess/DirectUnpack.cpp +++ b/daemon/postprocess/DirectUnpack.cpp @@ -180,7 +180,7 @@ void DirectUnpack::ExecuteUnrar(const char* archiveName) params.emplace_back("-p-"); } - if (!params.Exists("-o+") && !params.Exists("-o-")) + if (!params.Exists("-o+") && !params.Exists("-o-") && !params.Exists("-or")) { params.emplace_back("-o+"); } diff --git a/daemon/postprocess/Unpack.cpp b/daemon/postprocess/Unpack.cpp index 77ad0305a..ecbed1b2f 100644 --- a/daemon/postprocess/Unpack.cpp +++ b/daemon/postprocess/Unpack.cpp @@ -285,7 +285,7 @@ void UnpackController::ExecuteUnrar(const char* password) params.emplace_back("-p-"); } - if (!params.Exists("-o+") && !params.Exists("-o-")) + if (!params.Exists("-o+") && !params.Exists("-o-") && !params.Exists("-or")) { params.emplace_back("-o+"); }