fix jira and prevent

Change-Id: I8985e752e2bd055b6cd09dd8a654561cd7c35463

diff --git a/src/ui/controls/FUiCtrl_FooterImpl.cpp b/src/ui/controls/FUiCtrl_FooterImpl.cpp
index c486d0f..d3caaee 100644 (file)
--- a/src/ui/controls/FUiCtrl_FooterImpl.cpp
+++ b/src/ui/controls/FUiCtrl_FooterImpl.cpp
@@ -1132,10 +1132,9 @@ _FooterImpl::ConvertFooterItem(const FooterItem& footerItem)
                if (pColorReplacedBitmap && themeBackNormalBitmap == false)
                {
                        pButton->SetToolbarSelectedBitmap(*pColorReplacedBitmap, false);
-
-                       delete pColorReplacedBitmap;
                }
 
+               delete pColorReplacedBitmap;
                delete pSelectedBitmap;
        }
        else if (__style == FOOTER_STYLE_BUTTON_TEXT || __style == FOOTER_STYLE_BUTTON_ICON || __style == FOOTER_STYLE_BUTTON_ICON_TEXT)

diff --git a/src/ui/controls/FUiCtrl_HeaderImpl.cpp b/src/ui/controls/FUiCtrl_HeaderImpl.cpp
index f17d95a..a2dd410 100644 (file)
--- a/src/ui/controls/FUiCtrl_HeaderImpl.cpp
+++ b/src/ui/controls/FUiCtrl_HeaderImpl.cpp
@@ -1482,10 +1482,9 @@ _HeaderImpl::ConvertHeaderItem(const HeaderItem& headerItem)
                        {
                                pButton->SetToolbarSelectedBitmap(*pColorReplacedBitmap, false);
                        }
-
-                       delete pColorReplacedBitmap;
                }
 
+               delete pColorReplacedBitmap;
                delete pSelectedBitmap;
        }
        else // __style == HEADER_STYLE_BUTTON

diff --git a/src/ui/resource/FUi_ResourceFooterConfig.cpp b/src/ui/resource/FUi_ResourceFooterConfig.cpp
index f2acd4e..9282938 100755 (executable)
--- a/src/ui/resource/FUi_ResourceFooterConfig.cpp
+++ b/src/ui/resource/FUi_ResourceFooterConfig.cpp
@@ -39,8 +39,8 @@ START_UI_CONFIG(FOOTER);
 
        ADD_COLOR_CONFIG(BUTTON_TEXT_NORMAL, $B052L4);
        ADD_COLOR_CONFIG(BUTTON_TEXT_DISABLED, $B052L4);
-       ADD_COLOR_CONFIG(BUTTON_TEXT_PRESSED, $B052L4P);
-       ADD_COLOR_CONFIG(BUTTON_TEXT_HIGHLIGHTED, $B052L4P);
+       ADD_COLOR_CONFIG(BUTTON_TEXT_PRESSED, $B052L5);  // temp $B052L4P
+       ADD_COLOR_CONFIG(BUTTON_TEXT_HIGHLIGHTED, $B052L5); // temp $B052L4P
 
        ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_TEXT_NORMAL, $B052L8);
        ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_TEXT_DISABLED, $B052L8);