Merge branch releases/1.8 revisions 4779 to 4780 into trunk:

- Example 22 no longer select a random texture after loading a new texture (thanks at mongoose7 for reporting).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4781 dfc29bdd-3216-0410-991c-e03cc46cb475

changes.txt

@@ -58,7 +58,8 @@ Changes in 1.9 (not yet released)
 --------------------------
 Changes in 1.8.2
 
- - Fix bug in IGUISkin serialization which messed up serialization of the button-pressed offsets (Thanks at @Midnight for reporting).
+ - Example 22 no longer select a random texture after loading a new texture (thanks at mongoose7 for reporting).
+ - Fix bug in IGUISkin serialization which messed up serialization of the button-pressed offsets (thanks at Midnight for reporting).
  - IGUIStaticText::getTextHeight returns now the correct height for texts with newlines even WordWrap is not set.
  - Crashfix for CGUIEditBox. CGUIEditBox::setMultiLine must break text when changed or other functions like getTextDimension can crash afterward for strings with newline characters.
  - CGUIEditBox and the GUI-Editor now convert pasted text correctly using mbstowcs.

examples/22.MaterialViewer/main.cpp

@@ -450,7 +450,7 @@ public:
 	{
 		s32 oldSelected = ComboTexture->getSelected();
 		s32 selectNew = -1;
-		const wchar_t * oldTextureName = 0;
+		core::stringw oldTextureName;
 		if ( oldSelected >= 0 )
 		{
 			oldTextureName = ComboTexture->getItem(oldSelected);
@@ -461,7 +461,7 @@ public:
 			video::ITexture * texture = driver->getTextureByIndex(i);
 			core::stringw name( texture->getName() );
 			ComboTexture->addItem( name.c_str() );
-			if ( oldTextureName && selectNew < 0 && name == oldTextureName )
+			if ( !oldTextureName.empty() && selectNew < 0 && name == oldTextureName )
 				selectNew = i;
 		}