[Xfce4-commits] [panel-plugins/xfce4-whiskermenu-plugin] 01/01: Prevent infinite loop during load.

[noreply at xfce.org]

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

g   o   t   t   c   o   d   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository panel-plugins/xfce4-whiskermenu-plugin.

commit 8317e2e2891022fe110d4498155091225cac9210
Author: Graeme Gott <graeme at gottcode.org>
Date:   Tue Apr 17 09:13:19 2018 -0400

    Prevent infinite loop during load.
---
 panel-plugin/applications-page.cpp | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/panel-plugin/applications-page.cpp b/panel-plugin/applications-page.cpp
index 0c6483f..4d6dc4b 100644
--- a/panel-plugin/applications-page.cpp
+++ b/panel-plugin/applications-page.cpp
@@ -319,14 +319,6 @@ void ApplicationsPage::load_contents()
 		return;
 	}
 
-	// Reload if necessary
-	if (m_load_status == STATUS_LOADING_RELOAD)
-	{
-		m_load_status = STATUS_INVALID;
-		load_applications();
-		return;
-	}
-
 	// Set all applications category
 	get_view()->set_fixed_height_mode(true);
 	get_view()->set_model(m_categories.front()->get_model());
@@ -347,7 +339,7 @@ void ApplicationsPage::load_contents()
 	get_window()->set_items();
 	get_window()->set_loaded();
 
-	m_load_status = STATUS_LOADED;
+	m_load_status = (m_load_status == STATUS_LOADING) ? STATUS_LOADED : STATUS_INVALID;
 }
 
 //-----------------------------------------------------------------------------

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