Workaround for a possible race condition in the QWS server (mostly OZ)

(clipboard handling in Qt/E is a mess)

1 files changed, 15 insertions, 2 deletions

diff --git a/core/applets/clipboardapplet/clipboard.cpp b/core/applets/clipboardapplet/clipboard.cpp
index 4fbdf6f..3099a84 100644
--- a/core/applets/clipboardapplet/clipboard.cpp
+++ b/core/applets/clipboardapplet/clipboard.cpp
@@ -125,17 +125,17 @@ ClipboardApplet::ClipboardApplet( QWidget *parent, const char *name ) : QWidget(
         m_timer = new QTimer ( this );
         
         connect ( QApplication::clipboard ( ), SIGNAL( dataChanged ( )), this, SLOT( newData ( )));
         connect ( m_timer, SIGNAL( timeout ( )), this, SLOT( newData ( )));
         connect ( qApp, SIGNAL( aboutToQuit ( )), this, SLOT( shutdown ( )));
 
-        m_timer-> start ( 1500 );
-        
         m_menu = 0;
         m_dirty = true;
         m_lasttext = QString::null;
+        
+        m_timer-> start ( 0, true );
 }
 
 ClipboardApplet::~ClipboardApplet ( )
 {
 }
 
@@ -225,18 +225,31 @@ void ClipboardApplet::paintEvent ( QPaintEvent* )
         QPainter p ( this );
         p. drawPixmap ( 0, 1, m_clipboardPixmap );
 }
 
 void ClipboardApplet::newData ( )
 {
+        static bool excllock = false;
+        
+        if ( excllock )
+                return;
+        else
+                excllock = true;
+        
+        m_timer-> stop ( ); 
+        
         QCString type = "plain";
         QString txt = QApplication::clipboard ( )-> text ( type );
 
         if ( !txt. isEmpty ( ) && !m_history. contains ( txt )) {
                 m_history. append ( txt );
 
                 if ( m_history. count ( ) > 5 )
                         m_history. remove ( m_history. begin ( ));
                 
                 m_dirty = true;
         }
+        
+        m_timer-> start ( 1500, true );
+        
+        excllock = false;
 }