Changeset 8 for trunk/src/kernel/qnetworkprotocol.cpp

Timestamp:

Nov 16, 2005, 8:36:46 PM (20 years ago)

Author:

dmik

Message:

Transferred Qt for OS/2 version 3.3.1-rc5 sources from the CVS

File:

• trunk/src/kernel/qnetworkprotocol.cpp (modified) (3 diffs)

trunk/src/kernel/qnetworkprotocol.cpp

@@ -84 +84 @@
             oldOps.removeFirst();
         }
-        delete opStartTimer;
     }
 
@@ -430 +429 @@
 QNetworkProtocol::~QNetworkProtocol()
 {
+    QNetworkOperation *op = d->opInProgress;
+    if ( op ) {
+        op->setState( StStopped );
+        op->setProtocolDetail( tr( "Operation stopped by the user" ) );
+        emit finished( op );
+        // op->free() will be called by QNetworkOperationPrivate dtor below 
+    }
     delete d;
 }
@@ -1257 +1263 @@
 void QNetworkOperation::deleteMe()
 {
-    delete this;
+    // ### A hackish workaround to prevent this op from being deleted during
+    // the qApp->processEvents() call in QLocalFs::operationListChildren().
+    // The proper way is to add something like QNetworkOperation::cancelFree()
+    // to stop deleteTimer and make it a documented method.
+    if ( !signalsBlocked() )
+        delete this;
 }