From: Klaas Freitag <freitag@owncloud.com>
Date: Wed, 7 Oct 2015 15:59:33 +0000 (+0200)
Subject: FolderStatusModel: Check for null argument at start.
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~1493
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a203da39195e0a0a7e65c466171abd96e4214f7a;p=nextcloud-desktop.git

FolderStatusModel: Check for null argument at start.
---

diff --git a/src/gui/folderstatusmodel.cpp b/src/gui/folderstatusmodel.cpp
index 0f2c96c0b..8730ab813 100644
--- a/src/gui/folderstatusmodel.cpp
+++ b/src/gui/folderstatusmodel.cpp
@@ -349,13 +349,21 @@ FolderStatusModel::SubFolderInfo* FolderStatusModel::infoForIndex(const QModelIn
 
 QModelIndex FolderStatusModel::indexForPath(Folder *f, const QString& path) const
 {
+    if( !f ) {
+        return QModelIndex();
+    }
+
     int slashPos = path.lastIndexOf('/');
     if (slashPos == -1) {
         // first level folder
         for (int i = 0; i < _folders.size(); ++i) {
             if (_folders.at(i)._folder == f) {
+                if( path.isEmpty() ) { // the folder object
+                    return index(i, 0);
+                }
                 for (int j = 0; j < _folders.at(i)._subs.size(); ++j) {
-                    if (_folders.at(i)._subs.at(j)._name == path) {
+                    const QString subName = _folders.at(i)._subs.at(j)._name;
+                    if (subName == path) {
                         return index(j, 0, index(i));
                     }
                 }
@@ -499,6 +507,7 @@ void FolderStatusModel::fetchMore(const QModelIndex& parent)
     connect(job, SIGNAL(finishedWithError(QNetworkReply*)),
             this, SLOT(slotLscolFinishedWithError(QNetworkReply*)));
     job->start();
+
     QPersistentModelIndex persistentIndex(parent);
     job->setProperty(propertyParentIndexC , QVariant::fromValue(persistentIndex));