Merge branch 'Plasma/5.9'

This commit is contained in:
Martin Flöser 2017-05-07 09:38:52 +02:00
commit c555cf3956

2
main.h
View file

@ -126,7 +126,7 @@ public:
Always
};
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;
}
}