check if the window exists before trying to focus it

1 files changed, 8 insertions, 0 deletions

diff --git a/src/client.cc b/src/client.cc
index b36ba9af..f12e643a 100644
--- a/src/client.cc
+++ b/src/client.cc
@@ -1196,6 +1196,14 @@ bool Client::focus() const
 
   if (_focused) return true;
 
+  // do a check to see if the window has already been unmapped or destroyed
+  XEvent ev;
+  if (XCheckTypedWindowEvent(**otk::display, _window, UnmapNotify, &ev) ||
+      XCheckTypedWindowEvent(**otk::display, _window, DestroyNotify, &ev)) {
+    XPutBackEvent(**otk::display, &ev);
+    return false;
+  }
+
   if (_can_focus)
     XSetInputFocus(**otk::display, _window,
                    RevertToNone, CurrentTime);