From c06f54b76ab2bc2db41b7bfcf608194f914da53f Mon Sep 17 00:00:00 2001
From: Thorvald Natvig <slicer@users.sourceforge.net>
Date: Mon, 8 Mar 2010 14:05:12 +0100
Subject: [PATCH] Reintroduce logic to ensure either avatar or username is
 visible

---
 src/mumble/Overlay.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/mumble/Overlay.cpp b/src/mumble/Overlay.cpp
index 4491e0256..43fbbc88d 100644
--- a/src/mumble/Overlay.cpp
+++ b/src/mumble/Overlay.cpp
@@ -1170,11 +1170,21 @@ void OverlayEditor::on_qrbShout_clicked() {
 
 void OverlayEditor::on_qcbAvatar_clicked() {
 	oes.os.bAvatar = qcbAvatar->isChecked();
+	if (! oes.os.bAvatar && ! oes.os.bUserName) {
+		qcbUser->setChecked(true);
+		oes.os.bUserName = true;
+		oes.updateUserName();
+	}
 	oes.updateAvatar();
 }
 
 void OverlayEditor::on_qcbUser_clicked() {
 	oes.os.bUserName = qcbUser->isChecked();
+	if (! oes.os.bAvatar && ! oes.os.bUserName) {
+		qcbAvatar->setChecked(true);
+		oes.os.bAvatar = true;
+		oes.updateAvatar();
+	}
 	oes.updateUserName();
 }