diff options
Diffstat (limited to 'www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc')
| -rw-r--r-- | www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc b/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc new file mode 100644 index 000000000000..e2c3f7d10163 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc @@ -0,0 +1,14 @@ +--- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2016-05-11 19:02:14 UTC ++++ chrome/browser/media_galleries/media_file_system_registry.cc +@@ -768,7 +768,10 @@ class MediaFileSystemRegistry::MediaFile + // 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() { |