From e5de3e902c8a35c89f20ff3893213bb4b61c4cdb Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Thu, 28 Aug 2014 19:52:26 +0200
Subject: [PATCH] restore old placement of additionalRestartActions (should be
 after rerun action)

---
 platform/platform-resources/src/idea/LangActions.xml             | 1 -
 .../src/com/intellij/xdebugger/impl/ui/XDebugSessionTab.java     | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/platform-resources/src/idea/LangActions.xml b/platform/platform-resources/src/idea/LangActions.xml
index 3b0289f12433..9dd0708b1611 100644
--- a/platform/platform-resources/src/idea/LangActions.xml
+++ b/platform/platform-resources/src/idea/LangActions.xml
@@ -698,7 +698,6 @@
     </group>
 
     <group id="XDebugger.ToolWindow.LeftToolbar">
-      <reference ref="Rerun"/>
       <reference ref="Resume"/>
       <reference ref="Pause"/>
       <reference ref="Stop"/>
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebugSessionTab.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebugSessionTab.java
index 4c3766f23f5d..1a4505f6d85b 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebugSessionTab.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebugSessionTab.java
@@ -227,6 +227,7 @@ public class XDebugSessionTab extends DebuggerSessionTabBase {
     final Executor debugExecutor = DefaultDebugExecutor.getDebugExecutorInstance();
     ExecutionEnvironment environment = getEnvironment();
     if (environment != null) {
+      leftToolbar.add(ActionManager.getInstance().getAction(IdeActions.ACTION_RERUN));
       List<AnAction> additionalRestartActions = session.getRestartActions();
       if (!additionalRestartActions.isEmpty()) {
         leftToolbar.addAll(additionalRestartActions);