[Xfce4-commits] [panel-plugins/xfce4-whiskermenu-plugin] 189/473: Fix favorites and recent deleted when menu failed to load.

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

gottcode pushed a commit to branch master
in repository panel-plugins/xfce4-whiskermenu-plugin.

commit 87cefa62ee98d573a1225296c2cfbcfa9e0ed7c0
Author: Graeme Gott <graeme at gottcode.org>
Date:   Mon Oct 21 20:03:37 2013 -0400

    Fix favorites and recent deleted when menu failed to load.
---
 src/applications_page.cpp |    4 ++++
 src/page.cpp              |    2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/applications_page.cpp b/src/applications_page.cpp
index 21368b9..7431ac0 100644
--- a/src/applications_page.cpp
+++ b/src/applications_page.cpp
@@ -135,6 +135,10 @@ void ApplicationsPage::load_applications()
 		g_signal_connect_swapped(m_garcon_menu, "reload-required", G_CALLBACK(ApplicationsPage::invalidate_applications_slot), this);
 		load_menu(m_garcon_menu, NULL);
 	}
+	else
+	{
+		return;
+	}
 
 	// Sort items and categories
 	if (!f_load_hierarchy)
diff --git a/src/page.cpp b/src/page.cpp
index 7fbc169..ad423fe 100644
--- a/src/page.cpp
+++ b/src/page.cpp
@@ -73,7 +73,7 @@ void Page::reset_selection()
 	// Clear selection and scroll to top
 	GtkTreeModel* model = m_view->get_model();
 	GtkTreeIter iter;
-	if (gtk_tree_model_get_iter_first(model, &iter))
+	if (model && gtk_tree_model_get_iter_first(model, &iter))
 	{
 		GtkTreePath* path = gtk_tree_model_get_path(model, &iter);
 		get_view()->scroll_to_path(path);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.