From 08a07cfb3996860ad5906861868ee8ea7c576077 Mon Sep 17 00:00:00 2001 From: Carver Harrison Date: Sun, 22 Jan 2017 10:04:03 -0800 Subject: [PATCH 1/3] Update Commands.cs --- ShiftOS_TheReturn/Commands.cs | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/ShiftOS_TheReturn/Commands.cs b/ShiftOS_TheReturn/Commands.cs index 9aae1f6..23017e0 100644 --- a/ShiftOS_TheReturn/Commands.cs +++ b/ShiftOS_TheReturn/Commands.cs @@ -127,7 +127,7 @@ namespace ShiftOS.Engine } catch (Exception ex) { - Console.WriteLine("{ERROR}: " + ex.Message); + Console.WriteLine("{ERROR}: " + ex.Exception); } return true; } @@ -292,15 +292,8 @@ namespace ShiftOS.Engine [Command("crash")] public static bool CrashInstantly() { - try - { - throw new Exception("ShiftOS was sent a command to forcefully crash."); - } - catch (Exception e) - { - CrashHandler.Start(e); - return true; - } + CrashHandler.Start(new Exception("ShiftOS was sent a command to forcefully crash.")); + return true; } } #endif From e8a33885213805dd4b0efd5d22f362446f16bf8a Mon Sep 17 00:00:00 2001 From: Carver Harrison Date: Sun, 22 Jan 2017 10:04:59 -0800 Subject: [PATCH 2/3] Update Commands.cs --- ShiftOS_TheReturn/Commands.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ShiftOS_TheReturn/Commands.cs b/ShiftOS_TheReturn/Commands.cs index 23017e0..fe4254b 100644 --- a/ShiftOS_TheReturn/Commands.cs +++ b/ShiftOS_TheReturn/Commands.cs @@ -93,7 +93,7 @@ namespace ShiftOS.Engine if (args.ContainsKey("file")) - file = args["file"] as string; + file = args["file"] as string;F else throw new Exception("No 'file' argument provided."); @@ -127,7 +127,7 @@ namespace ShiftOS.Engine } catch (Exception ex) { - Console.WriteLine("{ERROR}: " + ex.Exception); + Console.WriteLine("{ERROR}: " + ex.Message); } return true; } From aaf92f6eb5d54f12636202218dfce3ba44c09063 Mon Sep 17 00:00:00 2001 From: Carver Harrison Date: Sun, 22 Jan 2017 10:10:42 -0800 Subject: [PATCH 3/3] Update Commands.cs --- ShiftOS_TheReturn/Commands.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ShiftOS_TheReturn/Commands.cs b/ShiftOS_TheReturn/Commands.cs index fe4254b..ed4d0e4 100644 --- a/ShiftOS_TheReturn/Commands.cs +++ b/ShiftOS_TheReturn/Commands.cs @@ -93,7 +93,7 @@ namespace ShiftOS.Engine if (args.ContainsKey("file")) - file = args["file"] as string;F + file = args["file"] as string; else throw new Exception("No 'file' argument provided.");