X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=dali-toolkit%2Finternal%2Fstyling%2Fstyle-manager-impl.cpp;h=ba89d889659826d6765acd829dc5713ac1fd166d;hb=ccead1b7440cb1acd1f06720cca83e32e8ef254b;hp=98596eb318e23fc8ed9ece30720d8661cbbcec14;hpb=ffef1f9f5d7d0f6beff38e628d0f4b91c61b62d4;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/styling/style-manager-impl.cpp b/dali-toolkit/internal/styling/style-manager-impl.cpp
index 98596eb..ba89d88 100644
--- a/dali-toolkit/internal/styling/style-manager-impl.cpp
+++ b/dali-toolkit/internal/styling/style-manager-impl.cpp
@@ -133,8 +133,7 @@ void StyleManager::ApplyTheme( const std::string& themeFile )
 
 void StyleManager::ApplyDefaultTheme()
 {
-  std::string empty;
-  SetTheme( empty );
+  SetTheme( DEFAULT_THEME );
 }
 
 const std::string& StyleManager::GetDefaultFontFamily() const
@@ -233,10 +232,10 @@ void StyleManager::SetTheme( const std::string& themeFile )
 
   // Always load the default theme first, then merge in the custom theme if present
   themeLoaded = LoadJSON( mThemeBuilder, DEFAULT_THEME );
+  mThemeFile = themeFile;
 
-  if( ! themeFile.empty() )
+  if( themeFile.compare(DEFAULT_THEME) != 0 )
   {
-    mThemeFile = themeFile;
     themeLoaded = LoadJSON( mThemeBuilder, mThemeFile );
   }