diff options
| author | Niklas Goby | 2011-04-05 18:36:34 +0200 |
|---|---|---|
| committer | Niklas Goby | 2011-04-05 18:36:34 +0200 |
| commit | 3fb934fc6b126fe361c0a82f6bf486e8dcef7b6a (patch) | |
| tree | 7c31b1d4a2ad22ab6e2301294480776f84e73dd4 /src | |
| parent | just some comments (diff) | |
| parent | moved check for host (diff) | |
| download | fbgui-3fb934fc6b126fe361c0a82f6bf486e8dcef7b6a.tar.gz fbgui-3fb934fc6b126fe361c0a82f6bf486e8dcef7b6a.tar.xz fbgui-3fb934fc6b126fe361c0a82f6bf486e8dcef7b6a.zip | |
Merge branch 'master' of git.openslx.org:lsfks/master-teamprojekt/fbgui
Diffstat (limited to 'src')
| -rw-r--r-- | src/fbgui.cpp | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/src/fbgui.cpp b/src/fbgui.cpp index de056d5..5527601 100644 --- a/src/fbgui.cpp +++ b/src/fbgui.cpp @@ -134,7 +134,8 @@ void fbgui::checkForTrigger(const QString& dirname) QFileInfo fi(dirname + "/" + tfi.fileName()); if (fi.exists()){ qxtLog->debug() << "[watcher] " << fileToTriggerURL << " detected."; - loadURL(); + // load URL if host exists + if (checkHost()) loadURL(); } else // do nothing / keep watching @@ -158,18 +159,15 @@ bool fbgui::checkHost() const //------------------------------------------------------------------------------------------- void fbgui::loadURL() { - // load if host is valid - if (checkHost()){ - // disconnect _watcher, his job is done - qxtLog->debug() << "[watcher] disconnected."; - _watcher->disconnect(this); - _watcher->deleteLater(); // memory problems with watcher - qxtLog->debug() << "[gui] Loading URL..."; - QByteArray postData = generatePOSTData(); - qxtLog->debug() << "[gui] POST data: " << postData; - QNetworkRequest req(baseURL); - _webView->load(req, QNetworkAccessManager::PostOperation, postData); - } + // disconnect _watcher, his job is done + qxtLog->debug() << "[watcher] disconnected."; + _watcher->disconnect(this); + _watcher->deleteLater(); // memory problems with watcher + qxtLog->debug() << "[gui] Loading URL..."; + QByteArray postData = generatePOSTData(); + qxtLog->debug() << "[gui] POST data: " << postData; + QNetworkRequest req(baseURL); + _webView->load(req, QNetworkAccessManager::PostOperation, postData); } //------------------------------------------------------------------------------------------- QByteArray fbgui::generatePOSTData() |