Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-12-18 15:47:57 +01:00
Code Issues Projects Releases Wiki Activity

Fix snap protocol handler (#11932)

Browse Source 
Co-authored-by: Matt Bishop <mbishop@bitwarden.com>
This commit is contained in:
Bernd Schoolmann 2024-11-13 14:06:57 +01:00 committed by GitHub
parent 24ca942cd6
commit 3508b4631d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/desktop/resources/memory-dump-wrapper.sh
View File

@ -7,6 +7,12 @@ ulimit -c 0
RAW_PATH=$(readlink -f "$0") RAW_PATH=$(readlink -f "$0")
APP_PATH=$(dirname $RAW_PATH) APP_PATH=$(dirname $RAW_PATH)
# force use of base image libdus in snap
if [ -e "/usr/lib/x86_64-linux-gnu/libdbus-1.so.3" ]
then
export LD_PRELOAD="/usr/lib/x86_64-linux-gnu/libdbus-1.so.3"
fi
# pass through all args # pass through all args
$APP_PATH/bitwarden-app "$@" $APP_PATH/bitwarden-app "$@"

12
apps/desktop/src/main/window.main.ts
View File

@ -12,15 +12,7 @@ import { BiometricStateService } from "@bitwarden/key-management";
import { WindowState } from "../platform/models/domain/window-state"; import { WindowState } from "../platform/models/domain/window-state";
import { DesktopSettingsService } from "../platform/services/desktop-settings.service"; import { DesktopSettingsService } from "../platform/services/desktop-settings.service";
import { import { cleanUserAgent, isDev, isLinux, isMac, isMacAppStore, isWindows } from "../utils";
cleanUserAgent,
isDev,
isLinux,
isMac,
isMacAppStore,
isSnapStore,
isWindows,
} from "../utils";
const mainWindowSizeKey = "mainWindowSize"; const mainWindowSizeKey = "mainWindowSize";
const WindowEventHandlingDelay = 100; const WindowEventHandlingDelay = 100;
@ -84,7 +76,7 @@ export class WindowMain {
return new Promise<void>((resolve, reject) => { return new Promise<void>((resolve, reject) => {
try { try {
if (!isMacAppStore() && !isSnapStore()) { if (!isMacAppStore()) {
const gotTheLock = app.requestSingleInstanceLock(); const gotTheLock = app.requestSingleInstanceLock();
if (!gotTheLock) { if (!gotTheLock) {
app.quit(); app.quit();