[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-367-g2fcfc65

[Thilo G. <tux...@ne...>]

Project "Tuxbox-GIT: apps":

The branch, master has been updated
       via  2fcfc65a1783740c2162dbd687df5cdee315e628 (commit)
      from  b5711dc641865e24f8381b9632e9ce92228af68f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2fcfc65a1783740c2162dbd687df5cdee315e628
Author: GetAway <get...@t-...>
Date:   Wed Mar 5 20:17:44 2014 +0100

    fix broken build of menue.cpp with newer compiler since introduced std::sort
    
    use braces to avoid ambiguous 'else'
    
    Signed-off-by: Thilo Graf <db...@no...>

diff --git a/tuxbox/neutrino/src/gui/widget/menue.cpp b/tuxbox/neutrino/src/gui/widget/menue.cpp
index 2e07e8d..6b62684 100644
--- a/tuxbox/neutrino/src/gui/widget/menue.cpp
+++ b/tuxbox/neutrino/src/gui/widget/menue.cpp
@@ -53,6 +53,7 @@
 #include <neutrino.h>
 
 #include <cctype>
+#include <algorithm>
 
 /* the following generic menu items are integrated into multiple menus at the same time */
 CMenuSeparator CGenericMenuSeparator;
@@ -184,11 +185,13 @@ void CMenuItem::paintItemButton(const bool select_mode, const int &item_height,
 	}
 #endif
 
-	if  (selected && offx > 0)
+	if (selected && offx > 0)
+	{
 		if (!selected_iconName.empty())
 			icon_name = selected_iconName;
 		else if (icon_name.empty() && !CRCInput::isNumeric(directKey))
 			icon_name = icon_Name;
+	}
 	
 	//paint icon
 	//get data for marker icon

-----------------------------------------------------------------------

Summary of changes:
 tuxbox/neutrino/src/gui/widget/menue.cpp |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)


-- 
Tuxbox-GIT: apps