Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Plasma
KWayland Integration
Commits
53704d86
Commit
53704d86
authored
May 16, 2022
by
Nicolas Fella
Browse files
Ensure that xdgActivationTokenArrived is not emitted directly from requestXdgActivationToken
See
frameworks/kwindowsystem@8d580e2f
parent
402d7ba7
Pipeline
#177343
passed with stage
in 1 minute and 42 seconds
Changes
1
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
src/windowsystem/windowsystem.cpp
View file @
53704d86
...
...
@@ -59,7 +59,10 @@ void WindowSystem::requestToken(QWindow *window, uint32_t serial, const QString
wl_surface
*
wlSurface
=
surface
?
static_cast
<
wl_surface
*>
(
*
surface
)
:
nullptr
;
WaylandXdgActivationV1
*
activation
=
WaylandIntegration
::
self
()
->
activation
();
if
(
!
activation
)
{
Q_EMIT
KWindowSystem
::
self
()
->
xdgActivationTokenArrived
(
serial
,
{});
// Ensure that xdgActivationTokenArrived is always emitted asynchronously
QTimer
::
singleShot
(
0
,
[
serial
]
{
Q_EMIT
KWindowSystem
::
self
()
->
xdgActivationTokenArrived
(
serial
,
{});
});
return
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment