Xcos: enforce xcos lib loading after the MVC 60/18060/1
Clément DAVID [Fri, 8 Apr 2016 15:26:20 +0000 (17:26 +0200)]
Change-Id: Ib65d631076b712629acd57dc445948bf76ee1625

scilab/modules/modules_manager/macros/tbx_build_blocks.sci
scilab/modules/xcos/macros/xcosPal.sci

index 587dfb7..9c883a9 100644 (file)
@@ -61,7 +61,7 @@ function tbx_build_blocks(module, names, macros_path)
     mprintf(gettext("Building blocks...\n"));
 
     // load Xcos libraries when not already loaded.
-    if ~exists("scicos_diagram") then loadXcosLibs(); end
+    if ~exists("Sourceslib") then loadXcosLibs(); end
 
     // create directories
     if ~isdir(module + "/images") then
index bb4cc0a..238ada4 100644 (file)
@@ -70,7 +70,7 @@ function pal = xcosPal(name, scs_m)
         name = "New palette";
     end
     // loading the scicos_diagram macro
-    if exists("scicos_diagram", "a") == 0 then loadXcosLibs(), end
+    if exists("Sourceslib", "a") == 0 then loadXcosLibs(), end
     if exists("scs_m", "l") == 0 then scs_m = scicos_diagram(), end
 
     if typeof(name) <> "string" then