shiftos-archive/ShiftOS_TheReturn
1
0
Fork 0
mirror of https://git.alee14.me/shiftos-archive/ShiftOS_TheReturn.git synced 2025-01-22 18:02:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix bug where terminal hangs on bad command

Browse source
This commit is contained in:
Michael 2017-06-02 08:15:51 -04:00
parent 5246798b0a
commit ce5469464a
1 changed files with 3 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
ShiftOS_TheReturn/TerminalBackend.cs
View file

@ -108,13 +108,7 @@ namespace ShiftOS.Engine
if (!commandWasClient && !string.IsNullOrWhiteSpace(ns))
{
PrefixEnabled = false;
ServerManager.SendMessage("script", $@"{{
user: ""{ns}"",
script: ""{command}"",
args: ""{GetSentArgs(arguments)}""
}}");
Console.WriteLine("Error: Command not found.");
}
CommandProcessed?.Invoke(ns + "." + command, JsonConvert.SerializeObject(arguments));
@ -369,27 +363,14 @@ namespace ShiftOS.Engine
{
var args = GetArgs(ref text);
Stopwatch debugger = new Stopwatch();
debugger.Start();
bool commandWasClient = RunClient(text, args, isRemote);
if (!commandWasClient)
{
Console.WriteLine("Command not found.");
debugger.Stop();
return;
Console.WriteLine("Error: Command not found.");
}
CommandProcessed?.Invoke(text, GetSentArgs(args));
debugger.Stop();
ConsoleEx.ForegroundColor = ConsoleColor.White;
Console.Write("<");
ConsoleEx.Bold = true;
ConsoleEx.ForegroundColor = ConsoleColor.Blue;
Console.Write("debugger");
ConsoleEx.ForegroundColor = ConsoleColor.White;
ConsoleEx.Bold = false;
Console.Write("> ");
Console.WriteLine("Command " + text + " took " + debugger.Elapsed.ToString() + " to execute.");
}
catch (Exception ex)
{