Merge branch 'backport' into work

[mikachu/openbox.git] / openbox / menuframe.c

diff --git a/openbox/menuframe.c b/openbox/menuframe.c
index b48b928..598bc00 100644 (file)
--- a/openbox/menuframe.c
+++ b/openbox/menuframe.c
@@ -386,8 +386,11 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
             text_a->texture[0].data.text.shortcut = FALSE;
         break;
     case OB_MENU_ENTRY_TYPE_SEPARATOR:
             text_a->texture[0].data.text.shortcut = FALSE;
         break;
     case OB_MENU_ENTRY_TYPE_SEPARATOR:

-        if (self->entry->data.separator.label != NULL)
+        if (self->entry->data.separator.label != NULL) {

             text_a = ob_rr_theme->a_menu_text_title;
             text_a = ob_rr_theme->a_menu_text_title;

+            text_a->texture[0].data.text.string =
+                self->entry->data.separator.label;
+        }

         else
             text_a = ob_rr_theme->a_menu_text_normal;
         break;
         else
             text_a = ob_rr_theme->a_menu_text_normal;
         break;