FIX

Hartmnt · Jun 26, 2024 · 6d88c2b · 6d88c2b
1 parent 1e634f2
commit 6d88c2b
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/src/mumble/widgets/TrayIcon.cpp b/src/mumble/widgets/TrayIcon.cpp
@@ -10,6 +10,7 @@
 #include "../Global.h"
 
 #include <QApplication>
+#include <QDebug>
 
 TrayIcon::TrayIcon()
 	: QSystemTrayIcon(Global::get().mw), m_statusIcon(Global::get().mw->qiIcon), m_currentIcon(nullptr) {
@@ -46,7 +47,7 @@ TrayIcon::TrayIcon()
 }
 
 void TrayIcon::updateIcon() {
-	QIcon newIcon;
+	QIcon &newIcon = Global::get().mw->qiIcon;
 
 	ClientUser *p = ClientUser::get(Global::get().uiSession);
 
@@ -79,11 +80,11 @@ void TrayIcon::updateIcon() {
 				newIcon = Global::get().mw->qiTalkingOff;
 				break;
 		}
-	} else {
-		newIcon = Global::get().mw->qiIcon;
 	}
 
-	if (&newIcon != &m_statusIcon.get()) {
+	qDebug() << "new icon: " << &newIcon << " status icon: " << &m_statusIcon.get();
+
+	if (&newIcon.get() != &m_statusIcon.get()) {
 		m_statusIcon = newIcon;
 		applyIcon(m_statusIcon);
 	}
@@ -129,6 +130,7 @@ void TrayIcon::updateContextMenu() {
 void TrayIcon::applyIcon(QIcon &icon) {
 	setIcon(icon);
 	m_currentIcon = &icon;
+	qDebug() << "current icon set to " << m_currentIcon;
 }
 
 void TrayIcon::toggleShowHide() {
@@ -184,10 +186,14 @@ void TrayIcon::unhighlight() {
 }
 
 void TrayIcon::on_timer_triggered() {
+	qDebug() << "current icon: " << m_currentIcon << " status icon: " << &m_statusIcon.get();
+
 	if (m_currentIcon == &m_statusIcon.get()) {
+		qDebug() << "Switch to I";
 		applyIcon(Global::get().mw->m_iconInformation);
 		m_highlightTimer->start(500);
 	} else {
+		qDebug() << "Switch to status";
 		applyIcon(m_statusIcon);
 		m_highlightTimer->start(2000);
 	}