1 files changed, 4 insertions, 2 deletions

diff --git a/src/SystemTray.cc b/src/SystemTray.cc
index 1c88836..af534f6 100644
--- a/src/SystemTray.cc
+++ b/src/SystemTray.cc
@@ -599,8 +599,10 @@ static int client_to_ordinal(const std::vector<std::string> left,
     // based on the parsed order list and a given window returns an
     // ordinal used to sort the tray icons.
 
-    std::unique_ptr<XClassHint, int(*)(void*)>
-        xclasshint(XAllocClassHint(), XFree);
+    auto deleter = [](XClassHint *x){if(x) XFree(x);};
+
+    std::unique_ptr<XClassHint, decltype(deleter)>
+        xclasshint(XAllocClassHint(), deleter);
 
     if(XGetClassHint(Fluxbox::instance()->display(),
                 i->window(), xclasshint.get()))