From 36b13dfdf0c4f89a22f12c9cb659b0ad2e33a8a4 Mon Sep 17 00:00:00 2001
From: Jonathan McPherson <jonathan@rstudio.com>
Date: Mon, 11 Dec 2017 14:58:50 -0800
Subject: [PATCH] save console process before computing interaction mode; fixes
 #1810

this change fixes an issue introduced in
2b7bff8f28b37d73d6063338b511cedd9caa5fae; because getInteractionMode()
uses the saved console process, it needs to be set before we check the
interaction mode.
---
 .../workbench/views/vcs/common/ConsoleProgressDialog.java      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/gwt/src/org/rstudio/studio/client/workbench/views/vcs/common/ConsoleProgressDialog.java b/src/gwt/src/org/rstudio/studio/client/workbench/views/vcs/common/ConsoleProgressDialog.java
index dbedddd688b..0e5b0af8e62 100644
--- a/src/gwt/src/org/rstudio/studio/client/workbench/views/vcs/common/ConsoleProgressDialog.java
+++ b/src/gwt/src/org/rstudio/studio/client/workbench/views/vcs/common/ConsoleProgressDialog.java
@@ -76,6 +76,9 @@ public ConsoleProgressDialog(String title,
          throw new IllegalArgumentException(
                "Invalid combination of arguments to ConsoleProgressDialog");
       }
+
+      // save console process so that we can compute interaction mode below
+      consoleProcess_ = consoleProcess;
       
       if (getInteractionMode() != ConsoleProcessInfo.INTERACTION_NEVER)
       {