aboutsummaryrefslogtreecommitdiff
path: root/www/ungoogled-chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc
blob: 67939acc8e9dd0b17a410ec27d6a967a8f6f7a7d (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
--- chrome/browser/media_galleries/media_file_system_registry.cc.orig	2025-09-10 13:22:16 UTC
+++ chrome/browser/media_galleries/media_file_system_registry.cc
@@ -582,7 +582,12 @@ class MediaFileSystemRegistry::MediaFileSystemContextI
 // Constructor in 'private' section because depends on private class definition.
 MediaFileSystemRegistry::MediaFileSystemRegistry()
     : file_system_context_(new MediaFileSystemContextImpl) {
-  StorageMonitor::GetInstance()->AddObserver(this);
+  /*
+   * This conditional is needed for shutdown.  Destructors
+   * try to get the media file system registry.
+   */
+  if (StorageMonitor::GetInstance())
+    StorageMonitor::GetInstance()->AddObserver(this);
 }
 
 MediaFileSystemRegistry::~MediaFileSystemRegistry() {