#3070 make sure we also pre-load the menus from the proxy server (by …

…doing it in server core)

xpra/platform/xposix/xdg_helper.py

@@ -291,8 +291,10 @@ def noicondata(d):
 
 load_lock = Lock()
 xdg_menu_data = None
-def load_xdg_menu_data(force_reload=False):
+def load_xdg_menu_data(force_reload=False, wait_for_lock=True):
     global xdg_menu_data, large_icons
+    if not wait_for_lock and load_lock.locked():
+        return xdg_menu_data
     with load_lock:
         if not xdg_menu_data or force_reload:
             large_icons = []

xpra/server/menu_provider.py

@@ -56,7 +56,7 @@ def setup(self):
         from xpra.platform.xposix.xdg_helper import load_xdg_menu_data
         #start loading in a thread,
         #so server startup can complete:
-        start_thread(load_xdg_menu_data, "load-xdg-menu-data", True)
+        start_thread(load_xdg_menu_data, "load-xdg-menu-data", True, (False, False))
 
     def cleanup(self):
         self.cancel_xdg_menu_reload()

xpra/server/server_core.py

@@ -382,6 +382,7 @@ def threaded_init(self):
                     log("threaded_init()", exc_info=True)
                     log.error("Error in initialization thread callback %s", cb)
                     log.error(" %s", e)
+        self.menu_provider.setup()
         log("threaded_init() servercore end")
 
     def after_threaded_init(self, callback):