Merge remote-tracking branch 'aosp/upstream-master' into merge

1 files changed, 9 insertions, 0 deletions

diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/XDebuggerGeneralSettings.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/XDebuggerGeneralSettings.java
index 9720d9517c51..205c1c3948ed 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/XDebuggerGeneralSettings.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/XDebuggerGeneralSettings.java
@@ -27,6 +27,7 @@ public class XDebuggerGeneralSettings {
   private boolean myUnmuteOnStop = false;
 
   private boolean hideDebuggerOnProcessTermination;
+  private boolean myShowDebuggerOnBreakpoint = true;
 
   @Tag("evaluation-dialog-mode")
   public EvaluationMode getEvaluationDialogMode() {
@@ -53,4 +54,12 @@ public class XDebuggerGeneralSettings {
   public void setHideDebuggerOnProcessTermination(boolean hideDebuggerOnProcessTermination) {
     this.hideDebuggerOnProcessTermination = hideDebuggerOnProcessTermination;
   }
+
+  public boolean isShowDebuggerOnBreakpoint() {
+    return myShowDebuggerOnBreakpoint;
+  }
+
+  public void setShowDebuggerOnBreakpoint(boolean showDebuggerOnBreakpoint) {
+    this.myShowDebuggerOnBreakpoint = showDebuggerOnBreakpoint;
+  }
 }