CComponentsHeader: fix order inside overloaded methode setCaption()

Stop() was never touched with string version of setCaption()
This commit is contained in:
2017-01-21 20:42:58 +01:00
committed by M. Liebmann
parent f045fb18e9
commit 58316d2091

View File

@@ -146,6 +146,8 @@ CComponentsHeader::~CComponentsHeader()
void CComponentsHeader::setCaption(const std::string& caption, const int& align_mode, const fb_pixel_t& text_color) void CComponentsHeader::setCaption(const std::string& caption, const int& align_mode, const fb_pixel_t& text_color)
{ {
if (cch_cl_obj)
cch_cl_obj->Stop();
cch_text = caption; cch_text = caption;
cch_caption_align = align_mode; cch_caption_align = align_mode;
cch_col_text = text_color; cch_col_text = text_color;
@@ -153,8 +155,6 @@ void CComponentsHeader::setCaption(const std::string& caption, const int& align_
void CComponentsHeader::setCaption(neutrino_locale_t caption_locale, const int& align_mode, const fb_pixel_t& text_color) void CComponentsHeader::setCaption(neutrino_locale_t caption_locale, const int& align_mode, const fb_pixel_t& text_color)
{ {
if (cch_cl_obj)
cch_cl_obj->Stop();
setCaption(string(g_Locale->getText(caption_locale)), align_mode, text_color); setCaption(string(g_Locale->getText(caption_locale)), align_mode, text_color);
} }