Merge "[4.0] Initialize WatchApplication mState" into tizen_4.0
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Thu, 18 Jan 2018 01:45:31 +0000 (01:45 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Thu, 18 Jan 2018 01:45:31 +0000 (01:45 +0000)
adaptors/wearable/watch-application-impl.cpp
adaptors/wearable/watch-application-impl.h

index dd5b004..c0fc0e5 100755 (executable)
@@ -38,7 +38,8 @@ WatchApplicationPtr WatchApplication::New(
 }
 
 WatchApplication::WatchApplication( int* argc, char** argv[], const std::string& stylesheet, Dali::Application::WINDOW_MODE windowMode )
-: Application(argc, argv, stylesheet, windowMode, PositionSize(), Framework::WATCH)
+: Application(argc, argv, stylesheet, windowMode, PositionSize(), Framework::WATCH),
+  mState( UNINITIALIZED )
 {
 }
 
index 0c9b723..9c162b4 100755 (executable)
@@ -37,6 +37,7 @@ typedef IntrusivePtr<WatchApplication> WatchApplicationPtr;
 
 enum WatchApplicationState
 {
+  UNINITIALIZED,
   INITIALIZED,
   PAUSED,
   RESUMED = INITIALIZED,