Merge "Fix setting a void string to the TEXT property." into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / text / text-controller-impl.h

diff --git a/dali-toolkit/internal/text/text-controller-impl.h b/dali-toolkit/internal/text/text-controller-impl.h
index 351ff82..2936d4d 100644 (file)
--- a/dali-toolkit/internal/text/text-controller-impl.h
+++ b/dali-toolkit/internal/text/text-controller-impl.h
@@ -322,14 +322,17 @@ struct Controller::Impl
 
   void ResetImfManager()
   {
 
   void ResetImfManager()
   {

-    // Reset incase we are in a pre-edit state.
-    ImfManager imfManager = ImfManager::Get();
-    if ( imfManager )
+    if( mEventData )

     {
     {

-      imfManager.Reset(); // Will trigger a commit message
+      // Reset incase we are in a pre-edit state.
+      ImfManager imfManager = ImfManager::Get();
+      if ( imfManager )
+      {
+        imfManager.Reset(); // Will trigger a commit message
+      }
+
+      ClearPreEditFlag();

     }
     }

-
-    ClearPreEditFlag();

   }
 
   bool IsClipboardEmpty()
   }
 
   bool IsClipboardEmpty()