From 40a355a42d4a9444dc753c04c6608dade2f06a23 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 19 Apr 2024 03:13:27 +0200
Subject: Adding upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 widget/windows/JumpListBuilder.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'widget/windows/JumpListBuilder.cpp')

diff --git a/widget/windows/JumpListBuilder.cpp b/widget/windows/JumpListBuilder.cpp
index 80b1c29aa7..e25c8c038f 100644
--- a/widget/windows/JumpListBuilder.cpp
+++ b/widget/windows/JumpListBuilder.cpp
@@ -176,8 +176,9 @@ JumpListBuilder::JumpListBuilder(const nsAString& aAppUserModelId,
   // the app, as it is set in the package manifest instead.
   if (!mozilla::widget::WinUtils::HasPackageIdentity()) {
     mIOThread->Dispatch(
-        NewRunnableMethod<nsString>(
-            "SetAppID", this, &JumpListBuilder::DoSetAppID, aAppUserModelId),
+        NewRunnableMethod<nsString>("SetAppID", this,
+                                    &JumpListBuilder::DoSetAppIDIfAvailable,
+                                    aAppUserModelId),
         NS_DISPATCH_NORMAL);
   }
 }
@@ -203,10 +204,13 @@ void JumpListBuilder::DoShutdownBackend() {
   mJumpListBackend = nullptr;
 }
 
-void JumpListBuilder::DoSetAppID(nsString aAppUserModelID) {
+void JumpListBuilder::DoSetAppIDIfAvailable(nsString aAppUserModelID) {
   MOZ_ASSERT(!NS_IsMainThread());
   MOZ_ASSERT(mJumpListBackend);
-  mJumpListBackend->SetAppID(aAppUserModelID.get());
+
+  if (mJumpListBackend->IsAvailable()) {
+    mJumpListBackend->SetAppID(aAppUserModelID.get());
+  }
 }
 
 NS_IMETHODIMP
-- 
cgit v1.2.3