From: Clément DAVID <clement.david@scilab-enterprises.com>
Date: Wed, 8 Aug 2012 14:27:45 +0000 (+0200)
Subject: * Bug #11704 fixed - Xcos close put an invalid command in Scilab queue
X-Git-Tag: 5.4.0-beta-3~168
X-Git-Url: http://gitweb.scilab.org/?p=scilab.git;a=commitdiff_plain;h=c729135c0011d21562043f6a47ba72068d8ee28a

* Bug #11704 fixed - Xcos close put an invalid command in Scilab queue

Change-Id: I76b16833a853057b0e882a488d2aa93fdbc3fa74
---

diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java
index 05ad3aa..34b101a 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java
@@ -651,7 +651,7 @@ public final class Xcos {
 
         if (openedDiagrams().size() <= 1) {
             /* halt scicos (stop the simulation) */
-            InterpreterManagement.requestScilabExec("haltscicos()");
+            InterpreterManagement.requestScilabExec("if isdef('haltscicos'), haltscicos(), end;");
         }
     }
 
@@ -748,7 +748,7 @@ public final class Xcos {
             instance.addDiagram(null, null);
 
             /* terminate any remaining simulation */
-            InterpreterManagement.putCommandInScilabQueue("if isdef('haltscicos'), then haltscicos(), end;");
+            InterpreterManagement.putCommandInScilabQueue("if isdef('haltscicos'), haltscicos(), end;");
 
             /* Saving modified data */
             instance.palette.saveConfig();