fix(nsis): always pass default compression even if nsis object is not…

… defined
anatawa12 · Jun 5, 2024 · 30bc3d2 · 30bc3d2
1 parent de7da04
commit 30bc3d2
Showing 1 changed file with 17 additions and 10 deletions.
diff --git a/tooling/bundler/src/bundle/windows/nsis.rs b/tooling/bundler/src/bundle/windows/nsis.rs
@@ -245,16 +245,6 @@ fn build_nsis_app_installer(
       );
     }
 
-    data.insert(
-      "compression",
-      to_json(match &nsis.compression {
-        NsisCompression::Zlib => "zlib",
-        NsisCompression::Bzip2 => "bzip2",
-        NsisCompression::Lzma => "lzma",
-        NsisCompression::None => "none",
-      }),
-    );
-
     data.insert(
       "display_language_selector",
       to_json(nsis.display_language_selector && languages.len() > 1),
@@ -265,6 +255,23 @@ fn build_nsis_app_installer(
       data.insert("installer_hooks", to_json(installer_hooks));
     }
   }
+
+  let compression = settings
+    .windows()
+    .nsis
+    .as_ref()
+    .map(|n| n.compression)
+    .unwrap_or_default();
+  data.insert(
+    "compression",
+    to_json(match compression {
+      NsisCompression::Zlib => "zlib",
+      NsisCompression::Bzip2 => "bzip2",
+      NsisCompression::Lzma => "lzma",
+      NsisCompression::None => "none",
+    }),
+  );
+
   data.insert(
     "install_mode",
     to_json(match install_mode {