osd: suppress errors with null window switcher fields

Fixes a regression in 75eb370 that emits errors like:

[../labwc/src/common/scaled-font-buffer.c:26] font_buffer_create() failed

...when osd_field_get_content() doesn't set non-null text.

diff --git a/src/osd.c b/src/osd.c
index 0dbe23e5b4cde1e9f249fdc79c620f22a533c81f..2c4ce2b2e5180808184e8297978768ef8e07ccd4 100644 (file)
--- a/src/osd.c
+++ b/src/osd.c
@@ -11,6 +11,7 @@
 #include "common/scaled-icon-buffer.h"
 #include "common/scaled-rect-buffer.h"
 #include "common/scene-helpers.h"
+#include "common/string-helpers.h"
 #include "config/rcxml.h"
 #include "labwc.h"
 #include "node.h"
@@ -369,16 +370,23 @@ create_osd_scene(struct output *output, struct wl_array *views)
                                buf_clear(&buf);
                                osd_field_get_content(field, &buf, *view);
 
-                               struct scaled_font_buffer *font_buffer =
-                                       scaled_font_buffer_create(item_root);
-                               scaled_font_buffer_update(font_buffer, buf.data, field_width,
-                                       &rc.font_osd, text_color, bg_color);
-                               node = &font_buffer->scene_buffer->node;
-                               height = font_height(&rc.font_osd);
+                               if (!string_null_or_empty(buf.data)) {
+                                       struct scaled_font_buffer *font_buffer =
+                                               scaled_font_buffer_create(item_root);
+                                       scaled_font_buffer_update(font_buffer,
+                                               buf.data, field_width,
+                                               &rc.font_osd, text_color, bg_color);
+                                       node = &font_buffer->scene_buffer->node;
+                                       height = font_height(&rc.font_osd);
+                               }
                        }
 
-                       wlr_scene_node_set_position(node, x,
-                               y + (theme->osd_window_switcher_item_height - height) / 2);
+                       if (node) {
+                               int item_height =
+                                       theme->osd_window_switcher_item_height;
+                               wlr_scene_node_set_position(node,
+                                       x, y + (item_height - height) / 2);
+                       }
                        x += field_width + theme->osd_window_switcher_item_padding_x;
                }