* Bug 16385 fixed: Xcos 'Simulation => Modelica init' error

   http://bugzilla.scilab.org/16385

Change-Id: I867cef8ee14805dc28633c5f7ac095d41496c312

diff --git a/scilab/CHANGES.md b/scilab/CHANGES.md
index 172764f..c78b86b 100644 (file)
--- a/scilab/CHANGES.md
+++ b/scilab/CHANGES.md
@@ -337,6 +337,7 @@ Bug Fixes
 * [#16369](https://bugzilla.scilab.org/16369): Right divisions / involving one or two sparse numerical matrices were no longer supported.
 * [#16370](https://bugzilla.scilab.org/16370): `msprintf()` did not handle LaTeX dollars anymore.
 * [#16374](https://bugzilla.scilab.org/16374): Any plot with datatips saved in Scilab 5.5 could not be loaded in Scilab 6.
+* [#16385](https://bugzilla.scilab.org/16385): In Xcos without any diagram, the menu `Simulation => Modelica initialize` displayed "Undefined variable: flag" in the console.
 * [#16391](https://bugzilla.scilab.org/16391): `csvRead()` was crashing with CSV files containing empty lines.
 * [#16396](https://bugzilla.scilab.org/16396): recursive extraction `(m:n)(:)` crashed Scilab
 * [#16397](https://bugzilla.scilab.org/16397): display of long (real) column vectors was slow (regression).

diff --git a/scilab/modules/scicos/macros/scicos_scicos/scicos_flat.sci b/scilab/modules/scicos/macros/scicos_scicos/scicos_flat.sci
index 4a0da2c..2b77eda 100644 (file)
--- a/scilab/modules/scicos/macros/scicos_scicos/scicos_flat.sci
+++ b/scilab/modules/scicos/macros/scicos_scicos/scicos_flat.sci
@@ -343,10 +343,11 @@ function  [cor,corinv,links_table,cur_fictitious,sco_mat,ok, IN, OUT, EIN, EOUT]
     end //end of loop on objects
 
     if ksup==0&nb==0 then
-        if or(flag=="nw") then
-            disp(msprintf(gettext("%s: Empty diagram"), "scicos_flat"));
+        msg = msprintf(gettext("%s: Empty diagram"), "Xcos: scicos_flat")
+        if or(getscilabmode()==["NW" "NWNI"]) then
+            disp(msg);
         else
-            messagebox(msprintf(gettext("%s: Empty diagram"), "Xcos"),"modal");
+            messagebox(msg,"modal");
         end
         ok=%f
         return