From 30bc3d2095066b8472e12ce058ca0348b0f7d70e Mon Sep 17 00:00:00 2001 From: amrbashir Date: Wed, 5 Jun 2024 20:05:03 +0300 Subject: [PATCH] fix(nsis): always pass default compression even if nsis object is not defined --- tooling/bundler/src/bundle/windows/nsis.rs | 27 ++++++++++++++-------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/tooling/bundler/src/bundle/windows/nsis.rs b/tooling/bundler/src/bundle/windows/nsis.rs index 1a8f32326..3328c9253 100644 --- 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 {