From 178b656d0846043d9624271f5fccf94bbf833cea Mon Sep 17 00:00:00 2001
From: Michael Carlberg <c@rlberg.se>
Date: Sat, 15 Oct 2016 14:00:33 +0200
Subject: [PATCH] fix(tray): Catch error while processing docking requests

---
 include/components/x11/tray.hpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/include/components/x11/tray.hpp b/include/components/x11/tray.hpp
index 1d30b703..15ebd4db 100644
--- a/include/components/x11/tray.hpp
+++ b/include/components/x11/tray.hpp
@@ -521,7 +521,12 @@ class traymanager
 
       switch (evt->data.data32[1]) {
         case SYSTEM_TRAY_REQUEST_DOCK:
-          process_docking_request(evt->data.data32[2]);
+          try {
+            process_docking_request(evt->data.data32[2]);
+          } catch (const std::exception& err) {
+            auto id = m_connection.id(evt->data.data32[2]);
+            m_logger.err("Error while processing docking request for %s (%s)", id, err.what());
+          }
           return;
 
         case SYSTEM_TRAY_BEGIN_MESSAGE: