Ticket #213: 213_busy_shell.001.patch

src/subshell.c

@@ -887 +887 @@
 
     struct timeval wtime;       /* Maximum time we wait for the subshell */
     struct timeval *wptr;
+    char lastChar;              /* for remove stupid 'The shell is already running a command' */
 
     /* we wait up to 10 seconds if fail_on_error, forever otherwise */
     wtime.tv_sec = 10;
@@ -984 +985 @@
             for (i = 0; i < bytes; ++i)
                 if (pty_buffer[i] == subshell_switch_key) {
                     write_all (subshell_pty, pty_buffer, i);
-                    if (subshell_ready)
+                    if (subshell_ready) {
                         subshell_state = INACTIVE;
+                    } else {
+                        if (lastChar != 0xd ){
+                            subshell_ready = TRUE;
+                            subshell_state = INACTIVE;
+                        }
+                    }
                     return TRUE;
                 }
 
             write_all (subshell_pty, pty_buffer, bytes);
+            lastChar = (char) pty_buffer[bytes-1];
             subshell_ready = FALSE;
         } else {
             return FALSE;