FancyMenu: try fix crash

lxqt · Jan 6, 2024 · eb37c9b · eb37c9b
1 parent 4eefd57
commit eb37c9b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/plugin-fancymenu/lxqtfancymenuwindow.cpp b/plugin-fancymenu/lxqtfancymenuwindow.cpp
@@ -329,24 +329,22 @@ void LXQtFancyMenuWindow::runCommandHelper(const QString &cmd)
 void LXQtFancyMenuWindow::addToFavorites(const QString &desktopFile)
 {
     mFavorites.append(desktopFile);
+
+    mAppModel->reloadAppMap(false);
     mAppMap->addToFavorites(desktopFile);
-    reloadFavoritesModel();
+    mAppModel->reloadAppMap(true);
+
     emit favoritesChanged();
 }
 
 void LXQtFancyMenuWindow::removeFromFavorites(const QString &desktopFile)
 {
     mFavorites.removeOne(desktopFile);
-    mAppMap->removeFromFavorites(desktopFile);
-    reloadFavoritesModel();
-    emit favoritesChanged();
-}
-
-void LXQtFancyMenuWindow::reloadFavoritesModel()
-{
-    // TODO: reload only if showing favorites
     mAppModel->reloadAppMap(false);
+    mAppMap->removeFromFavorites(desktopFile);
     mAppModel->reloadAppMap(true);
+
+    emit favoritesChanged();
 }
 
 QStringList LXQtFancyMenuWindow::favorites() const
@@ -357,6 +355,7 @@ QStringList LXQtFancyMenuWindow::favorites() const
 void LXQtFancyMenuWindow::setFavorites(const QStringList &newFavorites)
 {
     mFavorites = newFavorites;
+    mAppModel->reloadAppMap(false);
     mAppMap->setFavorites(mFavorites);
-    reloadFavoritesModel();
+    mAppModel->reloadAppMap(true);
 }
diff --git a/plugin-fancymenu/lxqtfancymenuwindow.h b/plugin-fancymenu/lxqtfancymenuwindow.h
@@ -62,7 +62,6 @@ private slots:
 
     void addToFavorites(const QString& desktopFile);
     void removeFromFavorites(const QString& desktopFile);
-    void reloadFavoritesModel();
 
 private:
     QStringList mFavorites;