diff options
| author | Javier S. Pedro <maemo@javispedro.com> | 2013-07-07 14:03:07 +0200 |
|---|---|---|
| committer | Javier S. Pedro <maemo@javispedro.com> | 2013-07-07 14:03:07 +0200 |
| commit | bf7f7b257a556da8c0e06b81264dbefb92435efe (patch) | |
| tree | 7b146f4c45afe81dc11413566beb727b9e547fb8 | |
| parent | f61dfc6557303a8bba5301927f42e5b2a7ffcac6 (diff) | |
| download | sowatch-bf7f7b257a556da8c0e06b81264dbefb92435efe.tar.gz sowatch-bf7f7b257a556da8c0e06b81264dbefb92435efe.zip | |
fix a few lv bugs
| -rw-r--r-- | liveview/liveview.cpp | 3 | ||||
| -rw-r--r-- | liveview/liveviewplugin.cpp | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/liveview/liveview.cpp b/liveview/liveview.cpp index 754bf2f..06bd914 100644 --- a/liveview/liveview.cpp +++ b/liveview/liveview.cpp @@ -368,9 +368,8 @@ QByteArray LiveView::encodeImage(const QUrl& url) void LiveView::send(const Message &msg) { - Q_ASSERT(_connected); _sendingMsgs.enqueue(msg); - if (_waitingForAck == NoMessage) { + if (_connected && _waitingForAck == NoMessage) { sendMessageFromQueue(); } else { #if PROTOCOL_DEBUG diff --git a/liveview/liveviewplugin.cpp b/liveview/liveviewplugin.cpp index 1f34949..d1f7ad0 100644 --- a/liveview/liveviewplugin.cpp +++ b/liveview/liveviewplugin.cpp @@ -31,8 +31,11 @@ WatchScanner* LiveViewPlugin::getScanner(QObject *parent) QUrl LiveViewPlugin::getConfigQmlUrl(const QString &driver) { - Q_UNUSED(driver); - return QUrl(); + if (driver == "liveview") { + return QUrl::fromLocalFile(SOWATCH_QML_DIR "/liveview-config.qml"); + } else { + return QUrl(); + } } Watch* LiveViewPlugin::getWatch(const QString& driver, ConfigKey* settings, QObject *parent) |