Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(nsis): properly handle Webview2 download return value #11131

Merged
merged 2 commits into from
Sep 25, 2024

Conversation

0rvar
Copy link
Contributor

@0rvar 0rvar commented Sep 25, 2024

The NSIS template was changed in #9605 to use NSISdl instead of nsis_tauri_utils for downloading Webview2, but the return value handling was not adjusted from comparing against 0, to the return value of NSISdl::download:

The return value is pushed to the stack:

  "cancel" if cancelled
  "success" if success
  otherwise, an error string describing the error

The issue can be reliably reproduced with Windows Sandbox, which never has Webiew2 preinstalled.

This PR adjusts the NSIS template to properly check the return value.

Before After - success After - offline
Screenshot 2024-09-25 153404 Screenshot 2024-09-25 161034 Screenshot 2024-09-25 161348

@0rvar 0rvar requested a review from a team as a code owner September 25, 2024 14:21
@0rvar 0rvar force-pushed the orvar/1.x-fix-nsis-webview2-download branch from 0355498 to 28aa17f Compare September 25, 2024 14:23
Copy link
Contributor

github-actions bot commented Sep 25, 2024

Package Changes Through 8e60414

There are 2 changes which include tauri-bundler with patch, tauri with patch

Planned Package Versions

The following package releases are the planned based on the context of changes in this pull request.

package current next
tauri-bundler 1.7.0 1.7.1
tauri 1.8.0 1.8.1
@tauri-apps/cli 1.6.2 1.6.3
tauri-cli 1.6.2 1.6.3

Add another change file through the GitHub UI by following this link.


Read about change files or the docs at github.com/jbolda/covector

@amrbashir amrbashir changed the title [NSIS] Properly handle Webview2 download return value fix(nsis): properly handle Webview2 download return value Sep 25, 2024
amrbashir added a commit that referenced this pull request Sep 25, 2024
@amrbashir amrbashir merged commit 019f94f into tauri-apps:1.x Sep 25, 2024
10 of 11 checks passed
amrbashir added a commit that referenced this pull request Sep 26, 2024
@0rvar 0rvar deleted the orvar/1.x-fix-nsis-webview2-download branch September 26, 2024 05:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants