diff options
| author | ncj674@motorola.com <ncj674@motorola.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-25 17:12:35 +0000 |
|---|---|---|
| committer | ncj674@motorola.com <ncj674@motorola.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-25 17:12:35 +0000 |
| commit | 7bc6cc9d4103d3a2087c719f18347f79b66bedf0 (patch) | |
| tree | bd0fe1f6376d763493b15e763b693df40ce97bb4 | |
| parent | 95bb392b3b1c72b456ebdc3caf3c29f5c316ffa1 (diff) | |
| download | chromium_src-7bc6cc9d4103d3a2087c719f18347f79b66bedf0.zip chromium_src-7bc6cc9d4103d3a2087c719f18347f79b66bedf0.tar.gz chromium_src-7bc6cc9d4103d3a2087c719f18347f79b66bedf0.tar.bz2 | |
Browser crashes while closing download shelf if menu is open
BUG=97724
TEST=1.Download a file, download shelf is shown
2.Click on the downloaded file after download completes. and quickly open the menu (the down arrow button)
3.Download shelf and menu should close itself and browser should not crash.
Review URL: http://codereview.chromium.org/8016001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102682 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/gtk/download/download_item_gtk.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/ui/gtk/download/download_item_gtk.cc b/chrome/browser/ui/gtk/download/download_item_gtk.cc index 5f9218e..0dc332f 100644 --- a/chrome/browser/ui/gtk/download/download_item_gtk.cc +++ b/chrome/browser/ui/gtk/download/download_item_gtk.cc @@ -266,6 +266,10 @@ DownloadItemGtk::DownloadItemGtk(DownloadShelfGtk* parent_shelf, } DownloadItemGtk::~DownloadItemGtk() { + // First close the menu and then destroy the GtkWidgets. Bug#97724 + if (menu_.get()) + menu_.reset(); + icon_consumer_.CancelAllRequests(); StopDownloadProgress(); get_download()->RemoveObserver(this); |