summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSylvain Munaut <tnt@246tNt.com>2015-01-04 19:47:23 +0100
committerSebastian Koslowski <koslowski@kit.edu>2015-02-12 23:07:16 +0100
commit40f5e6cdae82d279b95d7e02b8ef19d79dcd8163 (patch)
treea88af327f8038419fd746fa7286088384739e135
parent717c82330829e0820fce1108b2c94165ab83dd74 (diff)
grc: Move the XInitThreads to "As Early As Possible"
Seems some newer Qt do Xlib call right when doing the imports which then means that doing it in the main() is too late. Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
-rw-r--r--grc/python/flow_graph.tmpl25
1 files changed, 14 insertions, 11 deletions
diff --git a/grc/python/flow_graph.tmpl b/grc/python/flow_graph.tmpl
index 2a6ce7233a..859611e528 100644
--- a/grc/python/flow_graph.tmpl
+++ b/grc/python/flow_graph.tmpl
@@ -30,19 +30,21 @@ $DIVIDER
# Generated: $time.ctime()
$DIVIDER
-# Call XInitThreads as the _very_ first thing.
-# After some Qt import, it's too late
+## Call XInitThreads as the _very_ first thing.
+## After some Qt import, it's too late
#if $generate_options in ('wx_gui', 'qt_gui')
-import ctypes
-import sys
-if sys.platform.startswith('linux'):
- try:
- x11 = ctypes.cdll.LoadLibrary('libX11.so')
- x11.XInitThreads()
- except:
- print "Warning: failed to XInitThreads()"
-#end if
+if __name__ == '__main__':
+ import ctypes
+ import sys
+ if sys.platform.startswith('linux'):
+ try:
+ x11 = ctypes.cdll.LoadLibrary('libX11.so')
+ x11.XInitThreads()
+ except:
+ print "Warning: failed to XInitThreads()"
+#end if
+#
########################################################
##Create Imports
########################################################
@@ -279,6 +281,7 @@ $param.get_make()#slurp
$short_id#slurp
#end def
#if $generate_options != 'hb'
+
if __name__ == '__main__':
parser = OptionParser(option_class=eng_option, usage="%prog: [options]")
#set $params_eq_list = list()