cpp/openttd-patchpack/source Changeset - r24046:6505c9992aeb

Changeset - r24046:6505c9992aeb

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

Milek7 - 4 years ago 2020-01-12 13:56:27
Milek7@users.noreply.github.com

Fix: avoid using string pointer after scope end

1 file changed with 2 insertions and 1 deletions:

src/music_gui.cpp

0 comments (0 inline, 0 general)

src/music_gui.cpp

➞

Show inline comments

@@ @@ -732,11 +732,12 @@ struct MusicWindow : public Window { @@
 			case WID_M_TRACK_NAME: {
 				GfxFillRect(r.left, r.top + 1, r.right - 1, r.bottom, PC_BLACK);
 				StringID str = STR_MUSIC_TITLE_NONE;
 				MusicSystem::PlaylistEntry entry(_music.GetCurrentSong());
 				if (BaseMusic::GetUsedSet()->num_available == 0) {
 					str = STR_MUSIC_TITLE_NOMUSIC;
 				} else if (_music.IsPlaying()) {
 					str = STR_MUSIC_TITLE_NAME;
-					SetDParamStr(0, _music.GetCurrentSong().songname);
+					SetDParamStr(0, entry.songname);
+				}
 				DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, r.top + WD_FRAMERECT_TOP, str, TC_FROMSTRING, SA_HOR_CENTER);
 				break;

0 comments (0 inline, 0 general)