mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

fix: remove pretarget handler before window destruction

Browse source
This commit is contained in:
Jeremy Apthorp 2019-01-14 11:30:08 -08:00
parent 8122dd2c33
commit f115376595
2 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
atom/browser/native_window_views.cc
View file

@ -1216,6 +1216,14 @@ void NativeWindowViews::OnWidgetBoundsChanged(views::Widget* changed_widget,
} }
} }
void NativeWindowViews::OnWidgetDestroying(views::Widget* widget) {
#if defined(OS_LINUX)
aura::Window* window = GetNativeWindow();
if (window)
window->RemovePreTargetHandler(this);
#endif
}
void NativeWindowViews::DeleteDelegate() { void NativeWindowViews::DeleteDelegate() {
if (is_modal() && this->parent()) { if (is_modal() && this->parent()) {
auto* parent = this->parent(); auto* parent = this->parent();

1
atom/browser/native_window_views.h
View file

@ -161,6 +161,7 @@ class NativeWindowViews : public NativeWindow,
void AutoresizeBrowserView(int width_delta, void AutoresizeBrowserView(int width_delta,
int height_delta, int height_delta,
NativeBrowserView* browser_view); NativeBrowserView* browser_view);
void OnWidgetDestroying(views::Widget* widget) override;
// views::WidgetDelegate: // views::WidgetDelegate:
void DeleteDelegate() override; void DeleteDelegate() override;
views::View* GetInitiallyFocusedView() override; views::View* GetInitiallyFocusedView() override;