Merge branch 'Plasma/5.9'

9 years ago · c555cf3956
parent 572f730e8e 5c827743ea
commit c555cf3956
1 changed files with 1 additions and 1 deletions
--- a/main.h
+++ b/main.h
@ -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;
        }
    }