Merge pull request #7742 from mono/Therzok-patch-1

[Mac] ObjCMarshalledException is still not reported right

2 files changed, 3 insertions, 3 deletions

diff --git a/main/src/addins/MacPlatform/MacPlatform.cs b/main/src/addins/MacPlatform/MacPlatform.cs
index 0b9a6d51d5..d60c4f79c8 100644
--- a/main/src/addins/MacPlatform/MacPlatform.cs
+++ b/main/src/addins/MacPlatform/MacPlatform.cs
@@ -251,7 +251,7 @@ namespace MonoDevelop.MacIntegration
 			try {
 				throw new MarshalledObjCException (nsException);
 			} catch (MarshalledObjCException e) {
-				LoggingService.LogInternalError ("Unhandled ObjC Exception", e);
+				LoggingService.LogFatalError ("Unhandled ObjC Exception", e);
 				// Is there a way to figure out if it's going to crash us? Maybe check MarshalObjectiveCExceptionMode and MarshalManagedExceptionMode?
 			}
 
diff --git a/main/tests/MacPlatform.Tests/MacPlatformTest.cs b/main/tests/MacPlatform.Tests/MacPlatformTest.cs
index b164e87878..c285aac1c5 100644
--- a/main/tests/MacPlatform.Tests/MacPlatformTest.cs
+++ b/main/tests/MacPlatform.Tests/MacPlatformTest.cs
@@ -181,7 +181,7 @@ namespace MacPlatform.Tests
 		public void CriticalErrorsExceptionsHaveFullStacktracesInLog ()
 		{
 			var logger = new CapturingLogger {
-				EnabledLevel = EnabledLoggingLevel.Error,
+				EnabledLevel = EnabledLoggingLevel.Fatal,
 			};
 
 			try {
@@ -192,7 +192,7 @@ namespace MacPlatform.Tests
 
 				Assert.Throws<ObjCException> (() => void_objc_msgSend (ex.Handle, selector));
 
-				var (_, message) = logger.LogMessages.Single (x => x.Level == LogLevel.Error);
+				var (_, message) = logger.LogMessages.Single (x => x.Level == LogLevel.Fatal);
 				AssertMacPlatformStacktrace (message);
 			} finally {
 				LoggingService.RemoveLogger (logger.Name);