* Bug 12195 fixed: generateBlockImage sometimes changed the current driver

  http://bugzilla.scilab.org/12195

Change-Id: I12ac17067267fc257c1082015fafa58548b8eba1

diff --git a/scilab/CHANGES.md b/scilab/CHANGES.md
index ace3a8c..f0e3003 100644 (file)
--- a/scilab/CHANGES.md
+++ b/scilab/CHANGES.md
@@ -351,6 +351,7 @@ the [development mailing list](dev@lists.scilab.org) for a particular toolbox.
 * [#4276](http://bugzilla.scilab.org/show_bug.cgi?id=4276): `strsubst` replaced the first occurence in regex mode.
 * [#5278](http://bugzilla.scilab.org/show_bug.cgi?id=5278): obsolete `xset()` was still used in scripts, macros, tests and help pages.
 * [#11756](http://bugzilla.scilab.org/show_bug.cgi?id=11756): In the categories of the ATOMS GUI, actually available modules might be not listed.
+* [#12195](http://bugzilla.scilab.org/show_bug.cgi?id=12195): `generateBlockImage` sometimes changed the current graphic driver.
 * [#12771](http://bugzilla.scilab.org/show_bug.cgi?id=12771): xcosPalGenerateAllIcons help example was broken.
 * [#13592](http://bugzilla.scilab.org/show_bug.cgi?id=13592): In an axes in a uicontrol frame, setting a `legend` interactively might not follow the mouse accurately.
 * [#13900](http://bugzilla.scilab.org/show_bug.cgi?id=13900): `nanmin` and `nanmax` were useless duplicates of `min` and `max`

diff --git a/scilab/modules/xcos/macros/generateBlockImage.sci b/scilab/modules/xcos/macros/generateBlockImage.sci
index 0fb42be..b87c0aa 100644 (file)
--- a/scilab/modules/xcos/macros/generateBlockImage.sci
+++ b/scilab/modules/xcos/macros/generateBlockImage.sci
@@ -112,6 +112,7 @@ function status = generateBlockImage(block, path, filename, imageType, withPort)
     o = block;
     ierr = execstr("block  = " + o.gui + "(""plot"",o)", "errcatch");
     if (ierr <> 0) then
+        driver(previous_driver);
         return;
     end