Fix Coverity Scan issues CID 57634 and CID 57625

zealdocs · Apr 13, 2015 · 1ebe5ed · 1ebe5ed
1 parent eefaffe
commit 1ebe5ed
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/registry/listmodel.cpp b/src/registry/listmodel.cpp
@@ -71,11 +71,13 @@ QVariant ListModel::data(const QModelIndex &index, int role) const
             return QVariant();
         }
     case DocsetNameRole:
-        if (!index.parent().isValid())
-            return m_docsetRegistry->docset(index.row())->name();
+        if (index.parent().isValid())
+            return QVariant();
+        return m_docsetRegistry->docset(index.row())->name();
     case UpdateAvailableRole:
-        if (!index.parent().isValid())
-            return m_docsetRegistry->docset(index.row())->hasUpdate;
+        if (index.parent().isValid())
+            return QVariant();
+        return m_docsetRegistry->docset(index.row())->hasUpdate;
     default:
         return QVariant();
     }

diff --git a/src/ui/settingsdialog.cpp b/src/ui/settingsdialog.cpp
@@ -263,7 +263,8 @@ void SettingsDialog::downloadCompleted()
             dir.rename(docsetDirName, tmpName);
             QtConcurrent::run([=] {
                 QDir d(dir);
-                d.cd(tmpName);
+                if (!d.cd(tmpName))
+                    return;
                 d.removeRecursively();
             });
         }