diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-08-30 14:18:40 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-08-30 14:20:45 +0100 |
| commit | fe1cbda3b7513e0d3686d347aa991e7231067384 (patch) | |
| tree | 2d903436d060b0d1ab530d5e9933aecb44aad5e7 | |
| parent | 7113e2310b2a1eeb9d9e89bf5e7ed3a10f3640dd (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
| -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 eeb70a3c5648..ef14a796970d 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -1256,7 +1256,7 @@ IMPL_LINK( Dialog, ImplHandleLayoutTimerHdl, void*, EMPTYARG ) void Dialog::queue_layout() { - if (hasPendingLayout()) + if (hasPendingLayout() || isCalculatingInitialLayoutSize()) return; if (IsInClose()) return; |