From 0f6a78e1b6e4add919b3e3b13a163e6cb46baae0 Mon Sep 17 00:00:00 2001
From: estib <stron@me.com>
Date: Sat, 28 Sep 2024 11:00:33 +0200
Subject: [PATCH] fix: Test for integrateUpstreamModal being undefined

Don't try to read a property from the integration modal if it's undefined
---
 apps/desktop/src/lib/components/BaseBranch.svelte | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/desktop/src/lib/components/BaseBranch.svelte b/apps/desktop/src/lib/components/BaseBranch.svelte
index 56510a3ec..1fe91d35d 100644
--- a/apps/desktop/src/lib/components/BaseBranch.svelte
+++ b/apps/desktop/src/lib/components/BaseBranch.svelte
@@ -67,8 +67,8 @@
 			style="pop"
 			kind="solid"
 			tooltip={`Merges the commits from ${base.branchName} into the base of all applied virtual branches`}
-			disabled={$mode?.type !== 'OpenWorkspace' || integrateUpstreamModal.imports.open}
-			loading={integrateUpstreamModal.imports.open}
+			disabled={$mode?.type !== 'OpenWorkspace' || integrateUpstreamModal?.imports.open}
+			loading={integrateUpstreamModal?.imports.open}
 			onclick={mergeUpstream}
 		>
 			Merge into common base