From 4577ad7205c600c6c8e809e10d51eb2118cb66b5 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Sun, 24 Mar 2019 18:12:21 -0400 Subject: [PATCH] Defer gdk_init() until after CheckIsScript() This allows fontforge to run without an X server available. Fixes: https://github.com/fontforge/fontforge/issues/3582 --- fontforgeexe/startui.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fontforgeexe/startui.c b/fontforgeexe/startui.c index 1bb5fd8ca..ae15afbf2 100644 --- a/fontforgeexe/startui.c +++ b/fontforgeexe/startui.c @@ -900,9 +900,6 @@ int fontforge_main( int argc, char **argv ) { #if !(GLIB_CHECK_VERSION(2, 35, 0)) g_type_init(); #endif -#ifdef FONTFORGE_CAN_USE_GDK - gdk_init(&argc, &argv); -#endif /* Must be done before we cache the current directory */ /* Change to HOME dir if specified on the commandline */ @@ -1093,6 +1090,9 @@ int fontforge_main( int argc, char **argv ) { CheckIsScript(argc,argv); /* Will run the script and exit if it is a script */ /* If there is no UI, there is always a script */ /* and we will never return from the above */ +#ifdef FONTFORGE_CAN_USE_GDK + gdk_init(&argc, &argv); +#endif if ( load_prefs==NULL || (strcasecmp(load_prefs,"Always")!=0 && /* Already loaded */ strcasecmp(load_prefs,"Never")!=0 )) -- 2.21.0