From 6949cb200f0d384ca79fc4e7275e608a56d6726f Mon Sep 17 00:00:00 2001 From: "sky@chromium.org" Date: Thu, 25 Feb 2010 20:15:10 +0000 Subject: Fixes crash in dragging from download manager on chrome os. BUG=36516 TEST=on chromeos drag from the download manager and make sure we don't crash. Review URL: http://codereview.chromium.org/660088 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40040 0039d316-1c4b-4281-b951-d872f2087c98 --- views/widget/widget_gtk.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'views/widget') diff --git a/views/widget/widget_gtk.cc b/views/widget/widget_gtk.cc index 1dcc258..7cce516 100644 --- a/views/widget/widget_gtk.cc +++ b/views/widget/widget_gtk.cc @@ -180,7 +180,6 @@ void WidgetGtk::DoDrag(const OSExchangeData& data, int operation) { static_cast(data.provider()); GtkTargetList* targets = data_provider.GetTargetList(); GdkEvent* current_event = gtk_get_current_event(); - DCHECK(current_event); const OSExchangeDataProviderGtk& provider( static_cast(data.provider())); @@ -198,7 +197,8 @@ void WidgetGtk::DoDrag(const OSExchangeData& data, int operation) { provider.drag_image(), provider.cursor_offset_x(), provider.cursor_offset_y()); - gdk_event_free(current_event); + if (current_event) + gdk_event_free(current_event); gtk_target_list_unref(targets); drag_data_ = &data_provider; -- cgit v1.1