Merge lp:~gamag/widelands/bug1097420 into lp:widelands

[Gabriel Margiani]

The tabpanel gave a const char* to the set_tooltip, which needs a const std::string& .....

(This is a very small change, but maybe a review is good anyway :)

[Mark Scott (mxsscott)]

Right fix, wrong reason.

set_tooltip(const std::string&) will take a "const char*" - the compiler implicitly constructs a 'string' from the 'const char*' by using the 'string::string(const char*)' constructor.

If the Tab's tooltip is the empty string "", then the line 't = str.c_str();' will not be executed, leaving 't' with the value 0.

The implicit string constructor will crash if passed a null pointer, giving us this:

   "The exception said: basic_string::_S_construct null not valid"

(std::string is usually a template instantiation of std::basic_string<char>)

review: Approve

[SirVer (sirver)]

stuff like this happen easy when you convert const char* to string - which i recently did for tooltips.

=== modified file 'src/ui_basic/tabpanel.cc'
--- src/ui_basic/tabpanel.cc	2012-12-14 20:09:35 +0000
+++ src/ui_basic/tabpanel.cc	2013-01-08 22:07:27 +0000
@@ -315,13 +315,8 @@
 
 	if (hl != m_highlight) {
 		{
-			const char * t = 0;
-			if (hl >= 0) {
-				const std::string & str = m_tabs[hl]->tooltip;
-				if (str.size())
-					t = str.c_str();
-			}
-			set_tooltip(t);
+			if (hl >= 0)
+				set_tooltip(m_tabs[hl]->tooltip);
 		}
 		if (m_highlight >= 0)
 			update