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
@@ -130,4 +130,2 @@ ClipboardApplet::ClipboardApplet( QWidget *parent, const char *name ) : QWidget(
 
-        m_timer-> start ( 1500 );
-        
         m_menu = 0;
@@ -135,2 +133,4 @@ ClipboardApplet::ClipboardApplet( QWidget *parent, const char *name ) : QWidget(
         m_lasttext = QString::null;
+        
+        m_timer-> start ( 0, true );
 }
@@ -230,2 +230,11 @@ void ClipboardApplet::newData ( )
 {
+        static bool excllock = false;
+        
+        if ( excllock )
+                return;
+        else
+                excllock = true;
+        
+        m_timer-> stop ( ); 
+        
         QCString type = "plain";
@@ -241,2 +250,6 @@ void ClipboardApplet::newData ( )
         }
+        
+        m_timer-> start ( 1500, true );
+        
+        excllock = false;
 }