mirrors/desktop
1
0
Fork 0
mirror of https://github.com/zen-browser/desktop.git synced 2026-03-29 03:41:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

gh-12841: Fixed creating an unexpected folder in a second window when a new space is created (gh-12857)

Browse Source
This commit is contained in:
mr. m
2026-03-20 16:56:06 +01:00
committed by GitHub
parent 70e0adcdcb
commit 5fb931daad
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/windows/sign.ps1
View File

@@ -142,9 +142,9 @@ function SignAndPackage($name) {
$env:ZEN_SETUP_EXE_PATH="$PWD\windsign-temp\windows-x64-obj-$name\browser\installer\windows\instgen\setup.exe"
if ($name -eq "arm64") {
$env:WIN32_REDIST_DIR="$PWD\win-cross\vs2026\VC\Redist\MSVC\14.38.33135\arm64\Microsoft.VC143.CRT"
$env:WIN32_REDIST_DIR="$PWD\win-cross\vs2026\VC\Redist\MSVC\14.50.35719\arm64\Microsoft.VC143.CRT"
} else {
$env:WIN32_REDIST_DIR="$PWD\win-cross\vs2026\VC\Redist\MSVC\14.38.33135\x64\Microsoft.VC143.CRT"
$env:WIN32_REDIST_DIR="$PWD\win-cross\vs2026\VC\Redist\MSVC\14.50.35719\x64\Microsoft.VC143.CRT"
}
$env:MAR="..\\build\\windows\\mar.exe"

4
configs/windows/mozconfig
View File

@@ -16,9 +16,9 @@ if test "$ZEN_CROSS_COMPILING"; then
CROSS_COMPILE=1
if test "$SURFER_COMPAT" = "aarch64"; then
export WIN32_REDIST_DIR="$(echo ~)/win-cross/vs2026/VC/Redist/MSVC/14.38.33135/arm64/Microsoft.VC143.CRT"
export WIN32_REDIST_DIR="$(echo ~)/win-cross/vs2026/VC/Redist/MSVC/14.50.35719/arm64/Microsoft.VC143.CRT"
else
export WIN32_REDIST_DIR="$(echo ~)/win-cross/vs2026/VC/Redist/MSVC/14.38.33135/x64/Microsoft.VC143.CRT"
export WIN32_REDIST_DIR="$(echo ~)/win-cross/vs2026/VC/Redist/MSVC/14.50.35719/x64/Microsoft.VC143.CRT"
fi
fi

6
src/zen/sessionstore/ZenWindowSync.sys.mjs
View File

@@ -1495,6 +1495,12 @@ class nsZenWindowSync {
on_TabGroupCreate(aEvent) {
const tabGroup = aEvent.target;
// See gh-12841, when creating a new space, the tab group create
// event is fired for the zen-workspace-collapsible-pins element, but
// its not something we want to sync across windows, so we can just ignore it.
if (tabGroup.tagName === "zen-workspace-collapsible-pins") {
return;
}
if (tabGroup.id && tabGroup.alreadySynced) {
// This tab group was opened as part of a sync operation.
return;