From 3a98d32217a9a68201b17db14cb29a3d1913660c Mon Sep 17 00:00:00 2001 From: Marc Khouzam Date: Mon, 28 Jul 2014 14:08:29 -0400 Subject: [PATCH] Bug 440587 - Extra output in gdb console when using '-interpreter-exec console' Change-Id: I52c15661fc481d8cde9e04707c3cd0b58dd4fd31 Signed-off-by: Marc Khouzam Reviewed-on: https://git.eclipse.org/r/30625 Tested-by: Hudson CI Reviewed-by: Mikhail Khodjaiants Tested-by: Mikhail Khodjaiants --- .../cdt/dsf/mi/service/command/AbstractCLIProcess.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/AbstractCLIProcess.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/AbstractCLIProcess.java index 3abeb3773c7..7233a2ae99e 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/AbstractCLIProcess.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/AbstractCLIProcess.java @@ -264,7 +264,7 @@ public abstract class AbstractCLIProcess extends Process ICommand command = token.getCommand(); // Check if the command is a CLI command and if it did not originate from this class. - if (command instanceof CLICommand && + if ((command instanceof CLICommand || command instanceof MIInterpreterExecConsole) && !(command instanceof ProcessCLICommand || command instanceof ProcessMIInterpreterExecConsole)) { fSuppressConsoleOutputCounter++; @@ -354,7 +354,7 @@ public abstract class AbstractCLIProcess extends Process fPrompt = PromptType.IN_PRIMARY_PROMPT; ICommand command = token.getCommand(); - if (command instanceof CLICommand && + if ((command instanceof CLICommand || command instanceof MIInterpreterExecConsole) && !(command instanceof ProcessCLICommand || command instanceof ProcessMIInterpreterExecConsole)) { fSuppressConsoleOutputCounter--;