diff options
| author | Paul Gilbert | 2016-07-26 19:48:14 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-07-26 19:48:14 -0400 |
| commit | 504cf6ecb688a3f1c65a857bffd527d8b0e6ba63 (patch) | |
| tree | 0c0d96d4061c11850c851f0fc981c75a58c20515 /backends/midi | |
| parent | d8c28d15ae553d047b7e571f98727fa79ee143f3 (diff) | |
| parent | e19922d181e775791f9105b8be7ff410770ede51 (diff) | |
| download | scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.tar.gz scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.tar.bz2 scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.zip | |
Merge branch 'master' into xeen
Diffstat (limited to 'backends/midi')
| -rw-r--r-- | backends/midi/timidity.cpp | 1 | ||||
| -rw-r--r-- | backends/midi/windows.cpp | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/backends/midi/timidity.cpp b/backends/midi/timidity.cpp index d10b808bdb..497138850a 100644 --- a/backends/midi/timidity.cpp +++ b/backends/midi/timidity.cpp @@ -316,6 +316,7 @@ int MidiDriver_TIMIDITY::connect_to_server(const char* hostname, unsigned short if (connect(fd, (struct sockaddr *)&in, sizeof(in)) < 0) { warning("TiMidity: connect(): %s", strerror(errno)); + ::close(fd); return -1; } diff --git a/backends/midi/windows.cpp b/backends/midi/windows.cpp index e2b327ffa7..52a46200cb 100644 --- a/backends/midi/windows.cpp +++ b/backends/midi/windows.cpp @@ -185,6 +185,9 @@ MusicDevices WindowsMusicPlugin::getDevices() const { deviceNames.push_back(tmp.szPname); } + // Limit us to the number of actually retrieved devices. + numDevs = deviceNames.size(); + // Check for non-unique device names. This may happen if someone has devices with identical // names (e. g. more than one USB device of the exact same hardware type). It seems that this // does happen in reality sometimes. We generate index numbers for these devices. |