[Xfce4-commits] [panel-plugins/xfce4-whiskermenu-plugin] 04/18: Fixed crash when accessing null launcher in assert.

[noreply at xfce.org]

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

gottcode pushed a commit to annotated tag v1.3.2
in repository panel-plugins/xfce4-whiskermenu-plugin.

commit d430d790eae3cec6963fa8d5ad77746b71000043
Author: Graeme Gott <graeme at gottcode.org>
Date:   Wed Mar 12 12:31:18 2014 -0400

    Fixed crash when accessing null launcher in assert.
---
 panel-plugin/list-page.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/panel-plugin/list-page.cpp b/panel-plugin/list-page.cpp
index 04d9fea..1508ff7 100644
--- a/panel-plugin/list-page.cpp
+++ b/panel-plugin/list-page.cpp
@@ -154,9 +154,9 @@ void ListPage::on_row_changed(GtkTreeModel* model, GtkTreePath* path, GtkTreeIte
 
 	Launcher* launcher;
 	gtk_tree_model_get(model, iter, LauncherView::COLUMN_LAUNCHER, &launcher, -1);
-	g_assert(launcher->get_type() == Launcher::Type);
 	if (launcher)
 	{
+		g_assert(launcher->get_type() == Launcher::Type);
 		m_desktop_ids[pos] = launcher->get_desktop_id();
 		wm_settings->set_modified();
 	}
@@ -171,9 +171,9 @@ void ListPage::on_row_inserted(GtkTreeModel* model, GtkTreePath* path, GtkTreeIt
 	std::string desktop_id;
 	Launcher* launcher;
 	gtk_tree_model_get(model, iter, LauncherView::COLUMN_LAUNCHER, &launcher, -1);
-	g_assert(launcher->get_type() == Launcher::Type);
 	if (launcher)
 	{
+		g_assert(launcher->get_type() == Launcher::Type);
 		desktop_id = launcher->get_desktop_id();
 	}
 

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