From a218f44b5db233bbbd588b5766ec6f3e5e6cb822 Mon Sep 17 00:00:00 2001
From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Fri, 18 Mar 2005 06:29:11 +0000
Subject: Bug fixes and UI tweaking...

src/Fl_Menu_.cxx:
    - Fl_Menu_::find_item(): wasn't checking for a non-NULL label()...

fluid/alignment_panel.*:
fluid/widget_panel.*:
    - Use small controls, normalize layout.
    - Add FLTK header/footer comments.

fluid/Fluid_Image.cxx:
    - Use relative paths for images.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4127 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/Fl_Menu_.cxx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/Fl_Menu_.cxx b/src/Fl_Menu_.cxx
index 01605458e..26af47618 100644
--- a/src/Fl_Menu_.cxx
+++ b/src/Fl_Menu_.cxx
@@ -52,10 +52,10 @@ int Fl_Menu_::item_pathname(char *name, int namelen, const Fl_Menu_Item *findite
     for ( int t=0; t<size(); t++ ) {
         const Fl_Menu_Item *m = &(menu()[t]);
 	if ( m->submenu() ) {				// submenu? descend
-	    if ( *name ) SAFE_STRCAT("/");
-	    SAFE_STRCAT(m->label());
+	    if (*name) SAFE_STRCAT("/");
+	    if (m->label()) SAFE_STRCAT(m->label());
 	} else {
-	    if ( m->label() ) {				// menu item?
+	    if (m->label()) {				// menu item?
 		if ( m == finditem ) {			// found? tack on itemname, done.
 		    SAFE_STRCAT("/");
 		    SAFE_STRCAT(m->label());
-- 
cgit v1.2.3