Bug 1933261: Fix the profile missing and downgrade UIs to not hang on…

… startup. a=pascalc
goastian · Dec 6, 2024 · 251b0ad · 251b0ad
1 parent 9efa083
commit 251b0ad
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
@@ -2657,6 +2657,10 @@ static nsresult ProfileMissingDialog(nsINativeAppSupport* aNative) {
   rv = xpcom.SetWindowCreator(aNative);
   NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE);
 
+  #  ifdef XP_MACOSX
+  InitializeMacApp();
+#  endif
+
   {  // extra scoping is needed so we release these components before xpcom
      // shutdown
     nsCOMPtr<nsIStringBundleService> sbs =
@@ -2687,7 +2691,7 @@ static nsresult ProfileMissingDialog(nsINativeAppSupport* aNative) {
 
     return NS_ERROR_ABORT;
   }
-#endif    // MOZ_WIDGET_ANDROID
+#endif  // MOZ_WIDGET_ANDROID
 }
 
 static ReturnAbortOnError ProfileLockedDialog(nsIFile* aProfileDir,
@@ -3241,6 +3245,10 @@ static ReturnAbortOnError CheckDowngrade(nsIFile* aProfileDir,
     rv = xpcom.SetWindowCreator(aNative);
     NS_ENSURE_SUCCESS(rv, rv);
 
+#  ifdef XP_MACOSX
+    InitializeMacApp();
+#  endif
+
     {  // extra scoping is needed so we release these components before xpcom
        // shutdown
       bool hasSync = false;