From: <mrj...@us...> - 2008-04-13 04:53:06
|
Revision: 2703 http://tora.svn.sourceforge.net/tora/?rev=2703&view=rev Author: mrjohnson0 Date: 2008-04-12 21:53:10 -0700 (Sat, 12 Apr 2008) Log Message: ----------- some crasher fixes, but you'd have to be pretty brutal on tora to see actually cancel queries Modified Paths: -------------- trunk/tora/src/toeventquery.cpp trunk/tora/src/toeventquerytask.cpp trunk/tora/src/toresultmodel.cpp Modified: trunk/tora/src/toeventquery.cpp =================================================================== --- trunk/tora/src/toeventquery.cpp 2008-04-13 04:44:29 UTC (rev 2702) +++ trunk/tora/src/toeventquery.cpp 2008-04-13 04:53:10 UTC (rev 2703) @@ -141,7 +141,6 @@ void toEventQuery::stop(void) { if(Task) Task->close(); - Task = 0; } Modified: trunk/tora/src/toeventquerytask.cpp =================================================================== --- trunk/tora/src/toeventquerytask.cpp 2008-04-13 04:44:29 UTC (rev 2702) +++ trunk/tora/src/toeventquerytask.cpp 2008-04-13 04:53:10 UTC (rev 2703) @@ -116,6 +116,14 @@ void toEventQueryTask::close() { // exit thread event loop. safe to call before event loop starts. exit(); + + try { + if(Query) + Query->cancel(); + } + catch(...) { + // noop + } } Modified: trunk/tora/src/toresultmodel.cpp =================================================================== --- trunk/tora/src/toresultmodel.cpp 2008-04-13 04:44:29 UTC (rev 2702) +++ trunk/tora/src/toresultmodel.cpp 2008-04-13 04:53:10 UTC (rev 2703) @@ -81,7 +81,6 @@ { if (Query) Query->deleteLater(); - Query = NULL; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |