widelands-dev team mailing list archive

[Gabriel Margiani <margianig@xxxxxxxxx>]

Gabriel Margiani has proposed merging lp:~gamag/widelands/bug1097420 into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1097420 in widelands: "Window tabs in map editor cause exception"
  https://bugs.launchpad.net/widelands/+bug/1097420

For more details, see:
https://code.launchpad.net/~gamag/widelands/bug1097420/+merge/142412


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 :) 
-- 
https://code.launchpad.net/~gamag/widelands/bug1097420/+merge/142412
Your team Widelands Developers is requested to review the proposed merge of lp:~gamag/widelands/bug1097420 into lp:widelands.

=== 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