mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-20 21:43:06 +01:00
Code Issues Releases Wiki Activity

Merge pull request #1232 from zsilencer/bugfixing

Browse Source 
fixes #1230 and #1212
This commit is contained in:
Ted John
2015-06-05 10:58:13 +01:00
parent cb9630e30b 71ae580483
commit d8cf23b659
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/audio/mixer.cpp
View File

@@ -522,7 +522,6 @@ Channel* Mixer::Play(Source& source, int loop, bool deleteondone, bool deletesou
newchannel->Play(source, loop);
newchannel->deleteondone = deleteondone;
newchannel->deletesourceondone = deletesourceondone;
newchannel->stopping = false;
channels.push_back(newchannel);
}
Unlock();
@@ -867,8 +866,9 @@ void* Mixer_Play_Music(int pathid, int loop, int streaming)
Channel* channel = gMixer.Play(*source_samplestream, loop, false, true);
if (!channel) {
delete source_samplestream;
} else {
channel->SetGroup(MIXER_GROUP_MUSIC);
}
channel->SetGroup(MIXER_GROUP_MUSIC);
return channel;
} else {
delete source_samplestream;

2
src/interface/screenshot.c
View File

@@ -266,7 +266,7 @@ int screenshot_dump_png()
lodepng_palette_add(&state.info_raw, r, g, b, a);
}
error = lodepng_encode(&png, &pngSize, dpi->bits, stride, dpi->height, &state);
error = lodepng_encode(&png, &pngSize, dpi->bits, width, height, &state);
if (error) {
log_error("Unable to save screenshot, %u: %s", lodepng_error_text(error));
index = -1;