#1106 fixes:

* Xnest may append to the window title * Xephyr may append to the wmclass, but preserves the second part * fix logging git-svn-id: https://xpra.org/svn/Xpra/trunk@12696 3bb7dfac-3a0b-4e04-842a-767bc560f471
Xpra-org · May 27, 2016 · 72d69d8 · 72d69d8
1 parent 1fee304
commit 72d69d8
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/xpra/client/ui_client_base.py b/src/xpra/client/ui_client_base.py
@@ -1293,13 +1293,14 @@ def window_close_event(self, wid):
                 metadata = getattr(window, "_metadata", {})
                 log("window_close_event(%i) metadata=%s", wid, metadata)
                 class_instance = metadata.get("class-instance")
-                title = metadata.get("title")
-                log("window_close_event(%i) title=%s, class-instance(%s)=%s", wid, title, class_instance)
-                if title in TITLE_CLOSEEXIT:
+                title = metadata.get("title", "")
+                log("window_close_event(%i) title=%s, class-instance=%s", wid, title, class_instance)
+                matching_title_close = [x for x in TITLE_CLOSEEXIT if x and title.startswith(x)]
+                if matching_title_close:
                     log.info("window-close event on %s window, disconnecting", title)
                     self.quit(0)
                     return True
-                if class_instance and class_instance[0] in WM_CLASS_CLOSEEXIT:
+                if class_instance and class_instance[1] in WM_CLASS_CLOSEEXIT:
                     log.info("window-close event on %s window, disconnecting", class_instance[0])
                     self.quit(0)
                     return True