Merge branch 'Plasma/5.9'
This commit is contained in:
commit
c555cf3956
1 changed files with 1 additions and 1 deletions
2
main.h
2
main.h
|
@ -126,7 +126,7 @@ public:
|
||||||
Always
|
Always
|
||||||
};
|
};
|
||||||
void setX11Time(xcb_timestamp_t timestamp, TimestampUpdate force = TimestampUpdate::OnlyIfLarger) {
|
void setX11Time(xcb_timestamp_t timestamp, TimestampUpdate force = TimestampUpdate::OnlyIfLarger) {
|
||||||
if (timestamp > m_x11Time || force == TimestampUpdate::Always) {
|
if ((timestamp > m_x11Time || force == TimestampUpdate::Always) && timestamp != 0) {
|
||||||
m_x11Time = timestamp;
|
m_x11Time = timestamp;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue