From 7ce4bd53266444ddcc58a70d9ddcf71fbd2c06bb Mon Sep 17 00:00:00 2001 From: "Javier S. Pedro" Date: Sat, 20 Sep 2014 19:24:29 +0200 Subject: minor changes --- salmeta.pro | 8 ++++---- src/controller.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/salmeta.pro b/salmeta.pro index eccfb3f..04fc868 100644 --- a/salmeta.pro +++ b/salmeta.pro @@ -14,24 +14,24 @@ SOURCES += src/salmeta.cpp \ src/metawatchtransport.cpp \ src/metawatch.cpp \ src/metawatchbletransport.cpp \ + src/metawatchbttransport.cpp \ src/reconnecttimer.cpp \ src/notificationmonitor.cpp \ src/widgetinfo.cpp \ src/widgetinfomodel.cpp \ - src/availablewidgetsmodel.cpp \ - src/metawatchbttransport.cpp + src/availablewidgetsmodel.cpp HEADERS += \ src/controller.h \ src/metawatchtransport.h \ src/metawatch.h \ src/metawatchbletransport.h \ + src/metawatchbttransport.h \ src/reconnecttimer.h \ src/notificationmonitor.h \ src/widgetinfo.h \ src/widgetinfomodel.h \ - src/availablewidgetsmodel.h \ - src/metawatchbttransport.h + src/availablewidgetsmodel.h OTHER_FILES += qml/salmeta.qml \ qml/cover/CoverPage.qml \ diff --git a/src/controller.cpp b/src/controller.cpp index 5593582..e15a54a 100644 --- a/src/controller.cpp +++ b/src/controller.cpp @@ -273,9 +273,9 @@ void Controller::handleIncomingNotification(const QString &sender, const QIcon & void Controller::handleWidgetChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector &roles) { - if (roles.indexOf(WidgetInfoModel::UrlRole) >= 0) { - if (!isWatchConnected()) return; + if (!isWatchConnected()) return; + if (roles.indexOf(WidgetInfoModel::UrlRole) >= 0) { // Can't send partial updates to watch, so entire list must be // resubmitted everytime something important changes _metawatch->updateWidgetList(_widgets->toList()); -- cgit v1.2.3