[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdelibs/dcop
From:       Luboš Luňák <l.lunak () kde ! org>
Date:       2004-12-10 16:02:18
Message-ID: 20041210160218.31FFF1B9BF () office ! kde ! org
[Download RAW message or body]

CVS commit by lunakl: 

Fix infinite timeouts in combination with event loop.


  M +3 -2      dcopclient.cpp   1.187


--- kdelibs/dcop/dcopclient.cpp  #1.186:1.187
@@ -1891,5 +1891,5 @@ bool DCOPClient::callInternal(const QCSt
             tv.tv_usec = (msecs % 1000) * 1000;
             if ( select( socket() + 1, &fds, 0, 0, &tv ) <= 0 ) {
-                if( useEventLoop && (time_left > guiTimeout)) {
+                if( useEventLoop && (timeout < 0 || time_left > guiTimeout)) {
                     // nothing was available, we got a timeout. Reactivate
                     // the GUI in blocked state.
@@ -1899,4 +1899,5 @@ bool DCOPClient::callInternal(const QCSt
                         emit blockUserInput( true );
                     }
+                    if( timeout >= 0 )
                     d->eventLoopTimer.start(time_left - guiTimeout, true);
                     qApp->enter_loop();


[prev in list] [next in list] [prev in thread] [next in thread]