diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-08-30 14:18:40 +0100 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-08-30 20:03:54 +0000 |
| commit | 8e71befa4756de72675569649684fb4c34773e9b (patch) | |
| tree | a294618b26fa766c00d817fa717eefd769c25faf | |
| parent | 47134ddc12e130ff65848cb8faa72fa3a4a61c77 (diff) | |
Resolves: fdo#68396 Yield allowed layout timer to run during init layout
There are multiple pages getting generated in the styles dialog because the
dropcaps preview window calls "Yield" sometimes and sometimes the layout timer
gets a chance to activate *during* the creation of the dialog so there ends up
with two consecutive activations of some tabpages which has wonderful eventual
know on effects resulting in that crash later on.
Easiest thing is to disable the layout timer during the initial size
calculation
Change-Id: I7fb0a7ff89aa2c6013c5d8014deface107610000
(cherry picked from commit fe1cbda3b7513e0d3686d347aa991e7231067384)
Reviewed-on: https://gerrit.libreoffice.org/5696
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
| -rw-r--r-- | vcl/source/window/dialog.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 909b63880031..b0bc71b97f13 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -1247,7 +1247,7 @@ IMPL_LINK( Dialog, ImplHandleLayoutTimerHdl, void*, EMPTYARG ) void Dialog::queue_layout() { - if (hasPendingLayout()) + if (hasPendingLayout() || isCalculatingInitialLayoutSize()) return; if (IsInClose()) return; |