From c60720c32c4b6e8745ae4ec8eead825a06a93555 Mon Sep 17 00:00:00 2001 From: Kevin Smith Date: Sun, 3 Oct 2010 18:59:48 +0100 Subject: Make the webkit view loads synchronous. Hopefully Resolves: #589 diff --git a/Swift/QtUI/QtChatView.cpp b/Swift/QtUI/QtChatView.cpp index eea18f7..1ad274f 100644 --- a/Swift/QtUI/QtChatView.cpp +++ b/Swift/QtUI/QtChatView.cpp @@ -7,6 +7,7 @@ #include "QtChatView.h" #include +#include #include #include #include @@ -163,7 +164,16 @@ void QtChatView::resetView() { pageHTML.replace(pageHTML.indexOf("%@"), 2, "Variants/Blue on Green.css"); pageHTML.replace(pageHTML.indexOf("%@"), 2, ""/*headerSnippet.getContent()*/); pageHTML.replace(pageHTML.indexOf("%@"), 2, ""/*footerSnippet.getContent()*/); + QEventLoop syncLoop; + connect(webView_, SIGNAL(loadFinished(bool)), &syncLoop, SLOT(quit())); webPage_->mainFrame()->setHtml(pageHTML); + while (!viewReady_) { + QTimer t; + t.setSingleShot(true); + connect(&t, SIGNAL(timeout()), &syncLoop, SLOT(quit())); + t.start(50); + syncLoop.exec(); + } document_ = webPage_->mainFrame()->documentElement(); QWebElement chatElement = document_.findFirst("#Chat"); newInsertPoint_ = chatElement.clone(); -- cgit v0.10.2-6-g49f6