summaryrefslogtreecommitdiff
authorsandman <sandman>2002-08-28 23:18:58 (UTC)
committer sandman <sandman>2002-08-28 23:18:58 (UTC)
commit178bd471d12a88862fb4ac1a17842ea0fd63c160 (patch) (unidiff)
treec37b10465eca3b6c2431b7999fe32eb4692f12ee
parent186bdeb08c0d9ccd78177310cf9f69ea80b76a96 (diff)
downloadopie-178bd471d12a88862fb4ac1a17842ea0fd63c160.zip
opie-178bd471d12a88862fb4ac1a17842ea0fd63c160.tar.gz
opie-178bd471d12a88862fb4ac1a17842ea0fd63c160.tar.bz2
Workaround for a possible race condition in the QWS server (mostly OZ)
(clipboard handling in Qt/E is a mess)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/clipboardapplet/clipboard.cpp17
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(
130 130
131 m_timer-> start ( 1500 );
132
133 m_menu = 0; 131 m_menu = 0;
@@ -135,2 +133,4 @@ ClipboardApplet::ClipboardApplet( QWidget *parent, const char *name ) : QWidget(
135 m_lasttext = QString::null; 133 m_lasttext = QString::null;
134
135 m_timer-> start ( 0, true );
136} 136}
@@ -230,2 +230,11 @@ void ClipboardApplet::newData ( )
230{ 230{
231 static bool excllock = false;
232
233 if ( excllock )
234 return;
235 else
236 excllock = true;
237
238 m_timer-> stop ( );
239
231 QCString type = "plain"; 240 QCString type = "plain";
@@ -241,2 +250,6 @@ void ClipboardApplet::newData ( )
241 } 250 }
251
252 m_timer-> start ( 1500, true );
253
254 excllock = false;
242} 255}