Merge "Updated shader source to set precision explicitly" into tizen

diff --git a/base/dali-toolkit/internal/styling/style-manager-impl.cpp b/base/dali-toolkit/internal/styling/style-manager-impl.cpp
index c368a58..1ee0e9e 100644 (file)
--- a/base/dali-toolkit/internal/styling/style-manager-impl.cpp
+++ b/base/dali-toolkit/internal/styling/style-manager-impl.cpp
@@ -347,11 +347,16 @@ void StyleManager::RequestDefaultTheme()
 void StyleManager::SetTheme()
 {
   mThemeBuilder = CreateBuilder( mThemeBuilderConstants );
-  LoadJSON( mThemeBuilder, mThemeFile );
-
-  StyleChange change;
-  change.themeChange = true;
-  mStyleChangeSignal.Emit( Toolkit::StyleManager::Get(), change );
+  if ( LoadJSON( mThemeBuilder, mThemeFile ) )
+  {
+    StyleChange change;
+    change.themeChange = true;
+    mStyleChangeSignal.Emit( Toolkit::StyleManager::Get(), change );
+  }
+  else
+  {
+    mThemeBuilder.Reset();
+  }
 }
 
 Toolkit::Builder StyleManager::FindCachedBuilder( const std::string& key )