From cf050f415ed65ac0fcfc893b9b7a9a0e6aa329cc Mon Sep 17 00:00:00 2001
From: "Brian R. Bondy" <bbondy@gmail.com>
Date: Tue, 16 Oct 2018 23:50:20 -0400
Subject: [PATCH] Merge pull request #658 from brave/maxk-fix-crash-downloading

Fixes crashes when downloading an item (repro'd with a .crx)
---
 browser/ui/views/download/brave_download_item_view.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/browser/ui/views/download/brave_download_item_view.cc b/browser/ui/views/download/brave_download_item_view.cc
index 6cd58172e4bc..270c800cacd1 100644
--- a/browser/ui/views/download/brave_download_item_view.cc
+++ b/browser/ui/views/download/brave_download_item_view.cc
@@ -81,7 +81,9 @@ void BraveDownloadItemView::OnDownloadUpdated(
   download::DownloadItem* download) {
   // Check for conditions that would disregard origin url change and fall back
   // onto base implementation to handle them.
-  if (!model_.ShouldShowInShelf()) {
+  if (!model_.ShouldShowInShelf() ||
+      (DownloadItemView::download()->GetState() == DownloadItem::COMPLETE &&
+       model_.ShouldRemoveFromShelfWhenComplete())) {
     DownloadItemView::OnDownloadUpdated(download);
     return;
   }