Fixed prevent isssues & Modified the app icon

Change-Id: I37d5b95300d5d648aba43e990012bb1b75fef85f
Signed-off-by: Hongryeol Gil <hr.gil@samsung.com>

diff --git a/shared/res/screen-density-xhigh/mainmenu.png b/shared/res/screen-density-xhigh/mainmenu.png
index c38e62f..79d7c2f 100644 (file)
Binary files a/shared/res/screen-density-xhigh/mainmenu.png and b/shared/res/screen-density-xhigh/mainmenu.png differ

diff --git a/src/StAppSettingForm.cpp b/src/StAppSettingForm.cpp
index 3a0acf2..fa2f6d2 100644 (file)
--- a/src/StAppSettingForm.cpp
+++ b/src/StAppSettingForm.cpp
@@ -1376,19 +1376,19 @@ AppSettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                int stringLengthMin = 0;
                int stringLengthMax = 0;
 
-               String minLength = *static_cast<String*>(pItemNode->GetAttributeN(ID_APPSETTING_ATTRIBUTE_TYPE_MIN_LENGTH));
-               if (minLength != null)
+               String* pMinLength = static_cast<String*>(pItemNode->GetAttributeN(ID_APPSETTING_ATTRIBUTE_TYPE_MIN_LENGTH));
+               if (pMinLength != null)
                {
-                       Integer::Parse(minLength, stringLengthMin);
-
+                       Integer::Parse(*pMinLength, stringLengthMin);
+                       delete pMinLength;
                        AppLogDebug("max String size [%d]", stringLengthMin);
                }
 
-               String maxLength = *static_cast<String*>(pItemNode->GetAttributeN(ID_APPSETTING_ATTRIBUTE_TYPE_MAX_LENGTH));
-               if (maxLength != null)
+               String* pMaxLength = static_cast<String*>(pItemNode->GetAttributeN(ID_APPSETTING_ATTRIBUTE_TYPE_MAX_LENGTH));
+               if (pMaxLength != null)
                {
-                       Integer::Parse(maxLength, stringLengthMax);
-
+                       Integer::Parse(*pMaxLength, stringLengthMax);
+                       delete pMaxLength;
                        AppLogDebug("max String size [%d]", stringLengthMax);
                }
 
@@ -1450,9 +1450,6 @@ AppSettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        }
        else if ((pItemNode->GetType()).Equals(ID_APPSETTING_ITEM_TYPE_EXPAND_LIST, false))
        {
-               String* value = pItemNode->GetAttributeN(ID_APPSETTING_ATTRIBUTE_TYPE_VALUE);
-               String expendList;
-
                IEnumerator* pCurrentIEnumerator =  pItemNode->GetCurrentIEnumerator();
 
                if (!((pCurrentIEnumerator != null)
@@ -1460,9 +1457,14 @@ AppSettingForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                {
                        AppLogDebug("Expandlist has no expandItems & remove");
                        delete pCurrentIEnumerator;
+                       delete pItem;
+                       delete itemText;
                        return null;
                }
 
+               String* value = pItemNode->GetAttributeN(ID_APPSETTING_ATTRIBUTE_TYPE_VALUE);
+               String expendList;
+
                pItemNode->RegisterObserverlistener(__pIOAppSetting);
 
                pItem->Construct(Dimension(itemWidth, itemMainRectangle.height), style);