Mercurial > hg > svcore
comparison transform/ModelTransformerFactory.cpp @ 1126:39019ce29178 tony-2.0-integration
Merge through to branch for Tony 2.0
author | Chris Cannam |
---|---|
date | Thu, 20 Aug 2015 14:54:21 +0100 |
parents | 6ea7761a418b |
children | ba16388b937d |
comparison
equal
deleted
inserted
replaced
1119:e22bfe8ca248 | 1126:39019ce29178 |
---|---|
283 m_handlers[transformer]->noMoreModelsAvailable(); | 283 m_handlers[transformer]->noMoreModelsAvailable(); |
284 } | 284 } |
285 m_handlers.erase(transformer); | 285 m_handlers.erase(transformer); |
286 } | 286 } |
287 | 287 |
288 if (transformer->isAbandoned()) { | |
289 if (transformer->getMessage() != "") { | |
290 emit transformFailed("", transformer->getMessage()); | |
291 } | |
292 } | |
293 | |
288 transformer->wait(); // unnecessary but reassuring | 294 transformer->wait(); // unnecessary but reassuring |
289 delete transformer; | 295 delete transformer; |
290 } | 296 } |
291 | 297 |
292 void | 298 void |