From 254fc8b15d336bc32192cb6ac0ffb2f8b8f9aa55 Mon Sep 17 00:00:00 2001
From: maxim <maxim@lazarus-ide.org>
Date: Mon, 21 Oct 2019 22:16:34 +0000
Subject: [PATCH] Merged revision(s) 61504 #5746da87b0 from trunk: IDE:
 DoRunProject: reset ToolStatus only for errors on handlers, bug #35764
 ........

git-svn-id: branches/fixes_2_0@62105 -
---
 ide/main.pp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/ide/main.pp b/ide/main.pp
index 34feb848b6..a6fdfb41a4 100644
--- a/ide/main.pp
+++ b/ide/main.pp
@@ -7180,18 +7180,19 @@ begin
   debugln('Hint: (lazarus) [TMainIDE.DoRunProject] Debugger=',EnvironmentOptions.DebuggerConfig.DebuggerClass);
 
   try
-    Result := mrCancel;
+    Result:=mrCancel;
     Handled:=false;
     Result := DoCallRunDebug(Handled);
-    if Handled or (Result<>mrOk) then
+    if Handled then
       exit;
-
-    Result := mrCancel;
-    Result := DebugBoss.StartDebugging;
   finally
     if Result<>mrOk then
       ToolStatus:=itNone;
   end;
+  if Result<>mrOk then
+    exit;
+
+  Result := DebugBoss.StartDebugging;
 
   DebugLn('Hint: (lazarus) [TMainIDE.DoRunProject] END');
 end;