never initialize the display more than once

git-svn-id: https://xpra.org/svn/Xpra/trunk@20775 3bb7dfac-3a0b-4e04-842a-767bc560f471
Xpra-org · Oct 23, 2018 · a8c65fa · a8c65fa
1 parent 31c25cc
commit a8c65fa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/xpra/x11/gtk2/gdk_display_source.pyx b/src/xpra/x11/gtk2/gdk_display_source.pyx
@@ -72,6 +72,8 @@ display = None
 ######
 def init_gdk_display_source():
     global display
+    if display:
+        return
     cdef cGdkDisplay* gdk_display
     cdef Display * x11_display
     if not gdk.display_get_default():

diff --git a/src/xpra/x11/gtk3/gdk_display_source.pyx b/src/xpra/x11/gtk3/gdk_display_source.pyx
@@ -47,6 +47,8 @@ def init_gdk_display_source():
     if not is_X11():
         from xpra.scripts.config import InitException
         raise InitException("cannot use X11 bindings with Wayland and GTK3 (buggy)")
+    if display:
+        return
     cdef GdkDisplay* gdk_display
     cdef Display * x11_display
     #from gi.repository import GdkX11