Merge pull request #90 from kb2ma/develop_SW-167

SW-167. Fix.

software/openvisualizer/bin/openVisualizerApp/SConscript

@@ -11,6 +11,7 @@ Provides rungui, runcli, and runweb targets.
 import os
 import subprocess
 import sconsUtils
+import signal
 
 Import('env')
 
@@ -64,9 +65,14 @@ def uiRunner(target, source, env):
         p = subprocess.Popen(argList, env=subEnv)
 
         if env['WAIT_ON_UI']:
-            # Must wait for CLI program that uses raw_input(); otherwise
+            # Must wait for a program that uses raw_input(); otherwise
             # SCons exits and standard input is sent to shell.
             result = p.wait()
+
+            if (os.name == 'posix' and result == -signal.SIGTERM) \
+                    or (os.name != 'posix' and result == signal.SIGTERM):
+                # Likely from console; not an error
+                result = 0
         else:
             # Display PID to make it easier to kill if necessary.
             print 'Child PID is {0}'.format(p.pid)
@@ -156,6 +162,7 @@ cliEnv['HOSTOPT']    = None
 cliEnv['PORTOPT']    = None
 Alias('runcli', setupUiRunner(cliEnv, 'openVisualizerCli.py', []))
 
-webEnv  = env.Clone()
-webdirs = ['web_files']
+webEnv               = env.Clone()
+webdirs              = ['web_files']
+webEnv['WAIT_ON_UI'] = True
 Alias('runweb', setupUiRunner(webEnv, 'openVisualizerWeb.py', webdirs))

software/openvisualizer/bin/openVisualizerApp/openVisualizerWeb.py

@@ -402,4 +402,5 @@ def _addParserArgs(parser):
         input = raw_input('> ')
         if input=='q':
             print 'bye bye.'
+            app.close()
             os.kill(os.getpid(), signal.SIGTERM)