diff options
| -rw-r--r-- | src/corelib/kernel/qeventdispatcher_symbian.cpp | 8 | ||||
| -rw-r--r-- | src/plugins/bearer/symbian/qnetworksession_impl.cpp | 6 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_symbian.cpp b/src/corelib/kernel/qeventdispatcher_symbian.cpp index 5d7c59c..f209b7a 100644 --- a/src/corelib/kernel/qeventdispatcher_symbian.cpp +++ b/src/corelib/kernel/qeventdispatcher_symbian.cpp @@ -843,8 +843,12 @@ QtRRActiveScheduler::RunResult QtRRActiveScheduler::RunMarkedIfReady(TInt &runPr dataAccess->iStatus.iFlags&=~TRequestStatusAccess::ERequestActiveFlags; int vptr = *(int*)active; // vptr can be used to identify type when debugging leaves TRAP(error, QT_TRYCATCH_LEAVING(active->RunL())); - if (error!=KErrNone) - error=active->RunError(error); + if (error!=KErrNone) { + if (vptr != *(int*)active) + qWarning("Active object vptr change from 0x%08x to 0x%08x. Error %i not handled.", vptr, *(int*)active, error); + else + error=active->RunError(error); + } if (error) { qWarning("Active object (ptr=0x%08x, vptr=0x%08x) leave: %i\n", active, vptr, error); dispatcher->activeObjectError(error); diff --git a/src/plugins/bearer/symbian/qnetworksession_impl.cpp b/src/plugins/bearer/symbian/qnetworksession_impl.cpp index 9f6d08d..fbf21fa 100644 --- a/src/plugins/bearer/symbian/qnetworksession_impl.cpp +++ b/src/plugins/bearer/symbian/qnetworksession_impl.cpp @@ -1050,7 +1050,7 @@ void QNetworkSessionPrivateImpl::ConnectionStartComplete(TInt statusCode) qDebug() << "QNS this : " << QString::number((uint)this) << " - " << "RConnection::Start completed with status code: " << statusCode; #endif - delete ipConnectionStarter; + // ConnectionStarter *ipConnectionStarter will delete itself at the end of RunL ipConnectionStarter = 0; switch (statusCode) { @@ -1572,12 +1572,14 @@ void ConnectionStarter::Start(TConnPref &pref) void ConnectionStarter::RunL() { iOwner.ConnectionStartComplete(iStatus.Int()); - //note owner deletes on callback + delete this; } TInt ConnectionStarter::RunError(TInt err) { qWarning() << "ConnectionStarter::RunError" << err; + // there must have been a leave from iOwner.ConnectionStartComplete, in which case "delete this" in RunL was missed. + delete this; return KErrNone; } |