Fix NUI SetCustomAlgorithm crash

Change-Id: Iae847c59830d94ef853983511d744d36e59eec0e
Signed-off-by: dongsug.song <dongsug.song@samsung.com>

diff --git a/dali-csharp-binder/src/dali_wrap.cpp b/dali-csharp-binder/src/dali_wrap.cpp
index 1b4b8de404b06a3c0767661ab0543aaa6f8cf04c..cd97afd803832798dddd2710a3d78ffb56e2370b 100755 (executable)
--- a/dali-csharp-binder/src/dali_wrap.cpp
+++ b/dali-csharp-binder/src/dali_wrap.cpp
@@ -476,6 +476,7 @@ void SWIG_CSharpException(int code, const char *msg) {
 #include <dali-toolkit/devel-api/controls/web-view/web-view.h>
 #include "web-view-signal-converter.h"
 
+#include <dali/integration-api/debug.h>
 
 // add here SWIG version check
 
@@ -2567,7 +2568,7 @@ Dali::Actor SwigDirector_CustomAlgorithmInterface::GetNextFocusableActor(Dali::A
     jdirection = (int)direction;
     jresult = (void *) swig_callbackGetNextFocusableActor(jcurrent, jproposed, jdirection);
     if (!jresult) {
-      SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Unexpected null return for type Dali::Actor", 0);
+      DALI_LOG_ERROR("[ERROR][%s line:%d] Unexpected null return for type Dali::Actor! Next focus will be NULL, please be cautious to handle the keyboard foucs! ", __FILE__, __LINE__);
       return c_result;
     }
     c_result = *(Dali::Actor *)jresult;

diff --git a/dali-csharp-binder/src/flex-layout.cpp b/dali-csharp-binder/src/flex-layout.cpp
index e39eb0a8592fb909ee32b3668b77391e9025919c..cfd5d2eec4a6016a11c8c33f8605e4c6fa54deff 100755 (executable)
--- a/dali-csharp-binder/src/flex-layout.cpp
+++ b/dali-csharp-binder/src/flex-layout.cpp
@@ -12,9 +12,7 @@ extern "C" {
 
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_FlexLayout_New()
 {
-  void * jresult ;
-  Dali::Toolkit::Flex::Node* result;
-
+  Dali::Toolkit::Flex::Node* result = (Dali::Toolkit::Flex::Node*)0;
   {
     try {
       result = new Dali::Toolkit::Flex::Node();
@@ -32,8 +30,7 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_FlexLayout_New()
       };
     }
   }
-  jresult = (void *)result;
-  return result;
+  return (void *)result;
 }