orca r3847 - in trunk: . src/orca

[wwalker svn gnome org]

Author: wwalker
Date: Thu Apr 24 20:01:34 2008
New Revision: 3847
URL: http://svn.gnome.org/viewvc/orca?rev=3847&view=rev

Log:
Make orca_console_prefs work again.


Modified:
   trunk/ChangeLog
   trunk/src/orca/orca.in

Modified: trunk/src/orca/orca.in
==============================================================================
--- trunk/src/orca/orca.in	(original)
+++ trunk/src/orca/orca.in	Thu Apr 24 20:01:34 2008
@@ -278,11 +278,14 @@
         # erroneously types an illegal command line argument, the
         # help text is emitted and the other orca is not killed.
         #
-        if [ `egrep -c "\-s|\-g|\-t|\-n|\-u|\-e|\-d" <<< $ARGS` -eq 0 ]
+        if [ `egrep -c "\-s|\-g|\-n|\-u|\-e|\-d" <<< $ARGS` -eq 0 ]
         then
-            runOrca "NO_CLEANUP" &
-            orca_pid=$!
-            wait $orca_pid
+            if [ `egrep -c "\-t" <<< $ARGS` -eq 0 ]
+            then
+                runOrca "NO_CLEANUP"
+            else
+                runOrca
+            fi
         else
             runOrca &
             orca_pid=$!