QMiniz: Only close if we succeded to open it

.
MrStevns · Nov 28, 2024 · 85b43e6 · 85b43e6
1 parent 87007c5
commit 85b43e6
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/core_lib/src/qminiz.cpp b/core_lib/src/qminiz.cpp
@@ -85,16 +85,16 @@ Status MiniZ::compressFolder(QString zipFilePath, QString srcFolderPath, const Q
     mz_zip_zero_struct(mz);
 
     mz_bool ok = mz_zip_writer_init_file(mz, zipFilePath.toUtf8().data(), 0);
-    ScopeGuard mzScopeGuard2([&] {
-        mz_zip_writer_end(mz);
-    });
 
     if (!ok)
     {
         mz_zip_error err = mz_zip_get_last_error(mz);
         dd << QString("Error: Failed to init writer. Error code: %1, reason: %2").arg(static_cast<int>(err)).arg(mz_zip_get_error_string(err));
         return Status(Status::FAIL, dd);
     }
+    ScopeGuard mzScopeGuard2([&] {
+        mz_zip_writer_end(mz);
+    });
 
     // Add special uncompressed mimetype file to help with the identification of projects
     {
@@ -172,15 +172,14 @@ Status MiniZ::uncompressFolder(QString zipFilePath, QString destPath)
     mz_zip_zero_struct(mz);
 
     mz_bool ok = mz_zip_reader_init_file(mz, zipFilePath.toUtf8().data(), 0);
-    ScopeGuard mzScopeGuard2([&] {
-        mz_zip_reader_end(mz);
-    });
-
     if (!ok) {
         mz_zip_error err = mz_zip_get_last_error(mz);
         dd << QString("Error: Failed to init reader. Error code: %1, reason: %2").arg(static_cast<int>(err)).arg(mz_zip_get_error_string(err));
         return Status(Status::FAIL, dd);
     }
+    ScopeGuard mzScopeGuard2([&] {
+        mz_zip_reader_end(mz);
+    });
 
     int num = mz_zip_reader_get_num_files(mz);