3 files changed, 16 insertions, 7 deletions

diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index 28f43173..f23091d8 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -51,7 +51,13 @@ static iBool checkModifiers_(int have, int req) {
 }
 
 static void trigger_LabelWidget_(const iLabelWidget *d) {
+    const iWidget *w = constAs_Widget(d);
     postCommand_Widget(&d->widget, "%s", cstr_String(&d->command));
+    if (flags_Widget(w) & radio_WidgetFlag) {
+        iForEach(ObjectList, i, children_Widget(w->parent)) {
+            setFlags_Widget(i.object, selected_WidgetFlag, d == i.object);
+        }
+    }
 }
 
 static iBool processEvent_LabelWidget_(iLabelWidget *d, const SDL_Event *ev) {
diff --git a/src/ui/widget.c b/src/ui/widget.c
index d218d7ee..459c2ae1 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -124,13 +124,15 @@ int64_t flags_Widget(const iWidget *d) {
 }
 
 void setFlags_Widget(iWidget *d, int64_t flags, iBool set) {
-    iChangeFlags(d->flags, flags, set);
-    if (flags & keepOnTop_WidgetFlag) {
-        if (set) {
-            pushBack_PtrArray(onTop_RootData_(), d);
-        }
-        else {
-            removeOne_PtrArray(onTop_RootData_(), d);
+    if (d) {
+        iChangeFlags(d->flags, flags, set);
+        if (flags & keepOnTop_WidgetFlag) {
+            if (set) {
+                pushBack_PtrArray(onTop_RootData_(), d);
+            }
+            else {
+                removeOne_PtrArray(onTop_RootData_(), d);
+            }
         }
     }
 }
diff --git a/src/ui/widget.h b/src/ui/widget.h
index a2be30e9..f39612ed 100644
--- a/src/ui/widget.h
+++ b/src/ui/widget.h
@@ -59,6 +59,7 @@ enum iWidgetFlag {
     tight_WidgetFlag              = iBit(13), /* smaller padding */
     keepOnTop_WidgetFlag          = iBit(14), /* gets events first; drawn last */
     mouseModal_WidgetFlag         = iBit(15), /* eats all unprocessed mouse events */
+    radio_WidgetFlag              = iBit(16), /* select on click; deselect siblings */
     /* arrangement */
     fixedPosition_WidgetFlag               = iBit(17),
     arrangeHorizontal_WidgetFlag           = iBit(18), /* arrange children horizontally */