[lipstick] Avoid watching an empty directory. Fixes JB#52486

LauncherModel can get an empty list on its qml property and that should be handled without Qt warning. CategoryDefinitionStore modified just for completeness. (And because gdb mislead me first there)
sailfishos · Dec 11, 2020 · c2574f7 · c2574f7
1 parent 67507f8
commit c2574f7
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/src/components/launcherwatchermodel.cpp b/src/components/launcherwatchermodel.cpp
@@ -50,7 +50,9 @@ void LauncherWatcherModel::setFilePaths(const QStringList &paths)
             m_fileSystemWatcher.removePath(directory);
     }
 
-    m_fileSystemWatcher.addPaths(directories);
+    if (directories.length() > 0) {
+        m_fileSystemWatcher.addPaths(directories);
+    }
 
     emit filePathsChanged();
 }

diff --git a/src/notifications/categorydefinitionstore.cpp b/src/notifications/categorydefinitionstore.cpp
@@ -16,18 +16,25 @@
 #include "categorydefinitionstore.h"
 #include <QFileInfo>
 #include <QDir>
+#include <QDebug>
 
 //! The file extension for the category definition files
 static const char *FILE_EXTENSION = ".conf";
 
 //! The maximum size of the category definition file
 static const uint FILE_MAX_SIZE = 32768;
 
-CategoryDefinitionStore::CategoryDefinitionStore(const QString &categoryDefinitionsPath, uint maxStoredCategoryDefinitions, QObject *parent) :
-    QObject(parent),
-    m_categoryDefinitionsPath(categoryDefinitionsPath),
-    m_maxStoredCategoryDefinitions(maxStoredCategoryDefinitions)
+CategoryDefinitionStore::CategoryDefinitionStore(const QString &categoryDefinitionsPath,
+                                                 uint maxStoredCategoryDefinitions, QObject *parent)
+    : QObject(parent),
+      m_categoryDefinitionsPath(categoryDefinitionsPath),
+      m_maxStoredCategoryDefinitions(maxStoredCategoryDefinitions)
 {
+    if (m_categoryDefinitionsPath.isEmpty()) {
+        qWarning() << "CategoryDefinitionStore instantiated without a path";
+        return;
+    }
+
     if (!this->m_categoryDefinitionsPath.endsWith('/')) {
         this->m_categoryDefinitionsPath.append('/');
     }
@@ -43,7 +50,7 @@ void CategoryDefinitionStore::updateCategoryDefinitionFileList()
 {
     QDir categoryDefinitionsDir(m_categoryDefinitionsPath);
 
-    if(categoryDefinitionsDir.exists()) {
+    if (categoryDefinitionsDir.exists()) {
         QStringList filter("*" + QString(FILE_EXTENSION));
 
         QSet<QString> files = categoryDefinitionsDir.entryList(filter, QDir::Files).toSet();

diff --git a/src/notifications/categorydefinitionstore.h b/src/notifications/categorydefinitionstore.h
@@ -44,7 +44,8 @@ class CategoryDefinitionStore : public QObject
      * \param categoryDefinitionsPath The path where the different category definitions are defined
      * \param maxStoredCategoryDefinitions The maximum number of category definitions to keep in memory
      */
-    explicit CategoryDefinitionStore(const QString &categoryDefinitionsPath, uint maxStoredCategoryDefinitions = 100, QObject *parent = 0);
+    explicit CategoryDefinitionStore(const QString &categoryDefinitionsPath, uint maxStoredCategoryDefinitions = 100,
+                                     QObject *parent = 0);
 
     /*!
      * Tests if the \a category definition exists in the system.