admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4283 from mwrock/no_debug

Browse Source 
if running noninteractively then do not break into debugger on ctrl +…
This commit is contained in:
Aditya Patwardhan
2017-08-01 09:26:47 -07:00
committed by GitHub
parent 6afb8998e7 238ce9d97e
commit 75de2e9f07
1 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs
+24 -8
View File
@@ -304,11 +304,19 @@ namespace Microsoft.PowerShell
switch (args.SpecialKey)
{
case ConsoleSpecialKey.ControlC:
SpinUpBreakHandlerThread(false);
SpinUpBreakHandlerThread(shouldEndSession: false);
return;
case ConsoleSpecialKey.ControlBreak:
// Break into script debugger.
BreakIntoDebugger();
if (s_cpp.NonInteractive)
{
//ControlBreak mimics ControlC in Noninteractive shells
SpinUpBreakHandlerThread(shouldEndSession: true);
}
else
{
// Break into script debugger.
BreakIntoDebugger();
}
return;
}
}
@@ -325,13 +333,21 @@ namespace Microsoft.PowerShell
switch (signal)
{
case ConsoleControl.ConsoleBreakSignal.CtrlBreak:
// Break into script debugger.
BreakIntoDebugger();
if (s_cpp.NonInteractive)
{
//ControlBreak mimics ControlC in Noninteractive shells
SpinUpBreakHandlerThread(shouldEndSession: true);
}
else
{
// Break into script debugger.
BreakIntoDebugger();
}
return true;
// Run the break handler...
case ConsoleControl.ConsoleBreakSignal.CtrlC:
SpinUpBreakHandlerThread(false);
SpinUpBreakHandlerThread(shouldEndSession: false);
return true;
case ConsoleControl.ConsoleBreakSignal.Logoff:
@@ -343,12 +359,12 @@ namespace Microsoft.PowerShell
case ConsoleControl.ConsoleBreakSignal.Close:
case ConsoleControl.ConsoleBreakSignal.Shutdown:
SpinUpBreakHandlerThread(true);
SpinUpBreakHandlerThread(shouldEndSession: true);
return false;
default:
// Log as much sqm data as possible before we exit.
SpinUpBreakHandlerThread(true);
SpinUpBreakHandlerThread(shouldEndSession: true);
return false;
}
}