Don't test before deleting a pointer

It's fine to delete a null pointer. It has no effect. Assign nullptr after deleting make an access violation visible (crash).
lxqt · Jan 19, 2024 · 8064fdb · 8064fdb
1 parent 69f6bbc
commit 8064fdb
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/bookmarkswidget.cpp b/src/bookmarkswidget.cpp
@@ -193,8 +193,7 @@ BookmarksModel::BookmarksModel(QObject *parent)
 
 void BookmarksModel::setup()
 {
-    if (m_root)
-        delete m_root;
+    delete m_root;
     m_root = new BookmarkRootItem();
     m_root->addChild(new BookmarkFileGroupItem(m_root, Properties::Instance()->bookmarksFile));
     beginResetModel();
@@ -203,8 +202,8 @@ void BookmarksModel::setup()
 
 BookmarksModel::~BookmarksModel()
 {
-    if (m_root)
-        delete m_root;
+    delete m_root;
+    m_root = nullptr;
 }
 
 int BookmarksModel::columnCount(const QModelIndex & /* parent */) const