diff options
| author | Eike Rathke <erack@redhat.com> | 2017-06-29 14:02:58 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2017-06-29 14:03:30 +0200 |
| commit | 637d917d7551fed19c9685f974fb3e732a8f97e2 (patch) | |
| tree | 6dca357a1b7aaa224fdbd69f32614013990a6623 | |
| parent | acd8f0c344c573d1a3c360d4075971d3f0dc250c (diff) | |
Don't let m_nGrabLevel become negative, tdf#108705 related
... which then later leads to 2 Giga loops on the next GtkSalFrame dtor call,
for example on the second AutoFilter button popup in Calc.
Fall-out from
commit 9b32355ea6d8d5e34363ba0c57e74d75d7a7b1b7
Date: Fri Jun 23 12:48:12 2017 +0100
Resolves: tdf#108705 remove grabs on widget before destroying it
that brought this to surface.
Change-Id: I0edb7eec9384c716800f07ef1ed91fc8f1d7c119
| -rw-r--r-- | vcl/unx/gtk3/gtk3gtkframe.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx index 30a0e2787355..7cfaf9b2c04a 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -2573,9 +2573,12 @@ void GtkSalFrame::addGrabLevel() void GtkSalFrame::removeGrabLevel() { - --m_nGrabLevel; - if (m_nGrabLevel == 0) - gtk_grab_remove(getMouseEventWidget()); + if (m_nGrabLevel > 0) + { + --m_nGrabLevel; + if (m_nGrabLevel == 0) + gtk_grab_remove(getMouseEventWidget()); + } } void GtkSalFrame::closePopup() |