diff options
author | Luboš Luňák <l.lunak@collabora.com> | 2014-05-23 18:48:53 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@collabora.com> | 2014-05-23 18:56:05 +0200 |
commit | 8100131214ac2ee46b632703d8ba2babeaf3b5f6 (patch) | |
tree | ea57a61d7c7d827666c25b18a08a5136d2e1d0c6 /vcl | |
parent | 653e4adddfc80aeb91c1d21c18e95b3986c85c54 (diff) |
force posted events before timer timeouts in KDE4 event loop (bnc#467278)
In this particular case, basctl::Shell::onDocumentCreated() and pretty much
everything in basctl/ it seems operate on the current window. The "OnNew"
event that triggers this comes from a timeout generated who knows where
for whatever reason. However, the code "knows" what the current window
is by having basctl::Shell::SetCurWindow() react on events about the current
window changing ... which come from posted events.
So, unless it's defined somewhere that an ordering here must exist, this
is inherently racy. At least generic and Gtk event loops appear to always
deliver the posted event first, so force the same ordering in the KDE
event loop handling.
Change-Id: Ia098f6b45e6b5a5133a12a9172eb09069e6362f9
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/unx/kde4/KDEXLib.cxx | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx index 2630c0c51781..9d2949e693ec 100644 --- a/vcl/unx/kde4/KDEXLib.cxx +++ b/vcl/unx/kde4/KDEXLib.cxx @@ -349,6 +349,16 @@ void KDEXLib::StopTimer() void KDEXLib::timeoutActivated() { + // HACK? Always process posted events before timer timeouts. + // There are places that may watch both both (for example, there's a posted + // event about change of the current active window and there's a timeout + // event informing that a document has finished loading). This is of course + // racy, but both generic and gtk event loops manage to deliver posted events + // first, so it's at least consistent, and it probably kind of makes at least + // some sense (timeouts should be more ok to wait and be triggered somewhen). + while( SalKDEDisplay::self()->HasUserEvents() ) + SalKDEDisplay::self()->DispatchInternalEvent(); + X11SalData *pData = (X11SalData*)ImplGetSVData()->mpSalData; pData->Timeout(); // QTimer is not single shot, so will be restarted immediatelly |