2 files changed, 5 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index c5593f1..9250265 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 (Format: Year/Month/Day)
 Changes for 0.9.16:
 *06/04/18:
+   * Fix system tray resize looping/livelock, sf.net bug #1359442 (Simon)
+     SystemTray.cc
    * Fix iconbar updates (icon and title)
      (Thanks Mark Tiefenbruck, mark at tiefenbruck dot org)
      WinClient.hh/cc Window.hh/cc IconButton.cc IconbarTool.cc WinButton.cc
diff --git a/src/SystemTray.cc b/src/SystemTray.cc
index 1cab673..e9adeae 100644
--- a/src/SystemTray.cc
+++ b/src/SystemTray.cc
@@ -359,9 +359,10 @@ void SystemTray::handleEvent(XEvent &event) {
 
                 // this was why gaim wasn't centring the icon
                 (*it)->sendConfigureNotify(0, 0, (*it)->width(), (*it)->height());
+                // so toolbar know that we changed size
+                // done inside this loop, because otherwise we can get into nasty looping
+                resizeSig().notify();
             }
-            // so toolbar know that we changed size
-            resizeSig().notify();
         }
 
     }