From 20a0313d17db9c088f317651d1a61cc204f8ce3d Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Mon, 18 Apr 2016 00:35:03 +0100
Subject: [PATCH] Show correct tray icon immediately on enable

---
 src/tray.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/tray.c b/src/tray.c
index 3e2c7a68..ff9593c3 100644
--- a/src/tray.c
+++ b/src/tray.c
@@ -153,11 +153,12 @@ tray_init(void)
     }
 
     gtk_init(0, NULL);
-    gtk_main_iteration_do(FALSE);
     if (prefs_get_boolean(PREF_TRAY)) {
         log_debug("Building GTK icon");
         tray_enable();
     }
+
+    gtk_main_iteration_do(FALSE);
 }
 
 void
@@ -183,6 +184,7 @@ tray_enable(void)
 {
     prof_tray = gtk_status_icon_new_from_file(icon_filename->str);
     shutting_down = FALSE;
+    _tray_change_icon(NULL);
     timer = g_timeout_add(5000, _tray_change_icon, NULL);
 }