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

[platform/core/uifw/dali-toolkit.git] / base / dali-toolkit / internal / styling / style-manager-impl.cpp

diff --git a/base/dali-toolkit/internal/styling/style-manager-impl.cpp b/base/dali-toolkit/internal/styling/style-manager-impl.cpp
index 9e5b6a1..1ee0e9e 100644 (file)
--- a/base/dali-toolkit/internal/styling/style-manager-impl.cpp
+++ b/base/dali-toolkit/internal/styling/style-manager-impl.cpp
@@ -17,17 +17,18 @@
 // CLASS HEADER
 #include "style-manager-impl.h"
 
-// INTERNAL INCLUDES
-#include <dali-toolkit/public-api/controls/control.h>
-#include <dali-toolkit/public-api/controls/control-impl.h>
-#include <dali-toolkit/public-api/styling/style-manager.h>
-#include <dali/integration-api/debug.h>
-
 // EXTERNAL INCLUDES
 #include <fstream>
 #include <iostream>
 #include <sstream>
+#include <dali/public-api/adaptor-framework/singleton-service.h>
+#include <dali/public-api/object/type-registry.h>
+#include <dali/integration-api/debug.h>
 
+// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/controls/control.h>
+#include <dali-toolkit/public-api/controls/control-impl.h>
+#include <dali-toolkit/public-api/styling/style-manager.h>
 
 namespace
 {
@@ -346,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 )