From ae26fe6475f21e29c8119aec1f14ed05c956434b Mon Sep 17 00:00:00 2001 From: Renaud Barate Date: Mon, 5 Jan 2015 11:31:27 +0100 Subject: [PATCH] Fix bug preventing SALOME applications without GUI to launch properly This bug was introduced by commit 33045b958bf590997b2765a5f0a17c2139d92b92 --- bin/launchConfigureParser.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/bin/launchConfigureParser.py b/bin/launchConfigureParser.py index 51a197404..99db4a7cd 100755 --- a/bin/launchConfigureParser.py +++ b/bin/launchConfigureParser.py @@ -941,13 +941,14 @@ def get_env(theAdditionalOptions=None, appname=salomeappname, cfgname=salomecfgn else: dirs += re.split('[;|:]', os.getenv(config_var)) - gui_available = True - gui_resources_dir = os.path.join(os.getenv("GUI_ROOT_DIR"),'share','salome','resources','gui') - if os.getenv("GUI_ROOT_DIR") and os.path.isdir( gui_resources_dir ): - dirs.append(gui_resources_dir) + gui_available = False + if os.getenv("GUI_ROOT_DIR"): + gui_resources_dir = os.path.join(os.getenv("GUI_ROOT_DIR"),'share','salome','resources','gui') + if os.path.isdir( gui_resources_dir ): + gui_available = True + dirs.append(gui_resources_dir) pass - else: - gui_available = False + if not gui_available: kernel_resources_dir = os.path.join(os.getenv("KERNEL_ROOT_DIR"),'bin','salome','appliskel') if os.getenv("KERNEL_ROOT_DIR") and os.path.isdir( kernel_resources_dir ): dirs.append(kernel_resources_dir) -- 2.39.2