Index: /trunk/Ohana/src/opihi/cmd.basic/run_for.c
===================================================================
--- /trunk/Ohana/src/opihi/cmd.basic/run_for.c	(revision 14177)
+++ /trunk/Ohana/src/opihi/cmd.basic/run_for.c	(revision 14178)
@@ -91,6 +91,9 @@
     if (loop_break) break;
   }
+  /* 'last' and 'next' should only affect one loop */
   loop_last = loop_next = FALSE; 
-  /* 'last' and 'next' should only affect one loop */
+
+  /* break should propagate up if auto_break is set */
+  loop_break = FALSE;
   if (auto_break && !status) loop_break = TRUE;
 
Index: /trunk/Ohana/src/opihi/cmd.basic/run_while.c
===================================================================
--- /trunk/Ohana/src/opihi/cmd.basic/run_while.c	(revision 14177)
+++ /trunk/Ohana/src/opihi/cmd.basic/run_while.c	(revision 14178)
@@ -92,6 +92,9 @@
     free (val);
   } while (logic && !interrupt);
+  /* 'last' and 'next' should only affect one loop */
   loop_last = loop_next = FALSE; 
-  /* 'last' and 'next' should only affect one loop */
+
+  /* break should propagate up if auto_break is set */
+  loop_break = FALSE;
   if (auto_break && !status) loop_break = TRUE;