Merge branch 'Plasma/5.8' into Plasma/5.9

icc-effect-5.14.5
Martin Flöser 2017-05-07 09:38:02 +02:00
commit 5c827743ea
1 changed files with 1 additions and 1 deletions

2
main.h
View File

@ -110,7 +110,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;
}
}