Added html search result fetching

diff --git a/trunk/src/base/backbone/backbone.cpp b/trunk/src/base/backbone/backbone.cpp
index b1f9421..6dcdda4 100644 (file)
--- a/trunk/src/base/backbone/backbone.cpp
+++ b/trunk/src/base/backbone/backbone.cpp
@@ -342,10 +342,21 @@ void Backbone::searchHtml(QList<Translation *> translations) {
     _timerHtmlSearch.start();
 
     foreach(Translation* trans, translations)
-       _innerHtmlResult.append(
-               QtConcurrent::run(trans, &Translation::toHtml()));
+        if(trans)
+           _innerHtmlResult.append(
+                   QtConcurrent::run(trans, &Translation::toHtml));
 }
 
 void Backbone::htmlTranslationReady() {
+    foreach(QFuture<QString> res, _innerHtmlResult) {
+        if(!res.isFinished())
+            continue;
+        _htmlResult.append(res.result());
+        _innerHtmlResult.removeOne(res);
+    }
+    if(!_innerHtmlResult.size()) {
+        _timerHtmlSearch.stop();
+        Q_EMIT htmlReady();
+    }
 
 }