From e2589e3b48c4d05db198f7729708ac8bca6f42be Mon Sep 17 00:00:00 2001 From: Lauro Moura Date: Tue, 15 Jan 2019 17:51:20 +0900 Subject: efl-mono: Only raise exception for managed errors. Summary: Previously, any unhandled Eina_Error would cause an exception to be thrown when the control returned to C#. This commit changes this behavior to only raise it when an exception went unhandled from a C# callback back to C, like in an event handler, for example. Test Plan: run tests Reviewers: segfaultxavi, Jaehyun_Cho, felipealmeida Reviewed By: Jaehyun_Cho Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D7537 --- src/bin/eolian_mono/eolian/mono/klass.hh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/bin/eolian_mono/eolian/mono/klass.hh') diff --git a/src/bin/eolian_mono/eolian/mono/klass.hh b/src/bin/eolian_mono/eolian/mono/klass.hh index 907ac97..a22a5a0 100644 --- a/src/bin/eolian_mono/eolian/mono/klass.hh +++ b/src/bin/eolian_mono/eolian/mono/klass.hh @@ -579,7 +579,7 @@ struct klass << scope_tab << scope_tab << scope_tab << "Efl.Eo.Globals.data_set(this);\n" << scope_tab << scope_tab << "}\n" << scope_tab << scope_tab << "handle = Efl.Eo.Globals.instantiate_end(handle);\n" - << scope_tab << scope_tab << "Eina.Error.RaiseIfOccurred();\n" + << scope_tab << scope_tab << "Eina.Error.RaiseIfUnhandledException();\n" << scope_tab << "}\n" << scope_tab << "///Constructs an instance from a native pointer.\n" @@ -718,7 +718,7 @@ struct klass << scope_tab << scope_tab << scope_tab << scope_tab << "Eina.Log.Error($\"Failed to add event proxy for event {key}\");\n" << scope_tab << scope_tab << scope_tab << scope_tab << "return false;\n" << scope_tab << scope_tab << scope_tab << "}\n" - << scope_tab << scope_tab << scope_tab << "Eina.Error.RaiseIfOccurred();\n" + << scope_tab << scope_tab << scope_tab << "Eina.Error.RaiseIfUnhandledException();\n" << scope_tab << scope_tab << "} \n" << scope_tab << scope_tab << "event_cb_count[key]++;\n" << scope_tab << scope_tab << "return true;\n" @@ -740,7 +740,7 @@ struct klass << scope_tab << scope_tab << scope_tab << scope_tab << "Eina.Log.Error($\"Failed to remove event proxy for event {key}\");\n" << scope_tab << scope_tab << scope_tab << scope_tab << "return false;\n" << scope_tab << scope_tab << scope_tab << "}\n" - << scope_tab << scope_tab << scope_tab << "Eina.Error.RaiseIfOccurred();\n" + << scope_tab << scope_tab << scope_tab << "Eina.Error.RaiseIfUnhandledException();\n" << scope_tab << scope_tab << "} else if (event_count == 0) {\n" << scope_tab << scope_tab << scope_tab << "Eina.Log.Error($\"Trying to remove proxy for event {key} when there is nothing registered.\");\n" << scope_tab << scope_tab << scope_tab << "return false;\n" -- cgit v1.1