diff options
| author | Strangerke | 2012-10-10 08:26:41 +0200 |
|---|---|---|
| committer | Strangerke | 2012-10-10 08:26:41 +0200 |
| commit | b164cbb571fc4e0f2a6f002760a851d8ac592540 (patch) | |
| tree | 4d25f2e1f8241f6f3352fd9fb1135f5faa36dfd4 /audio/mididrv.cpp | |
| parent | b2f2f8d7b08b40e43702e8db325f8136066f10be (diff) | |
| parent | 1e200620d673af4acdd2d128ed6e390df001aacf (diff) | |
| download | scummvm-rg350-b164cbb571fc4e0f2a6f002760a851d8ac592540.tar.gz scummvm-rg350-b164cbb571fc4e0f2a6f002760a851d8ac592540.tar.bz2 scummvm-rg350-b164cbb571fc4e0f2a6f002760a851d8ac592540.zip | |
Merge branch 'master' of github.com:scummvm/scummvm into mortevielle
Conflicts:
base/plugins.cpp
configure
Diffstat (limited to 'audio/mididrv.cpp')
| -rw-r--r-- | audio/mididrv.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/audio/mididrv.cpp b/audio/mididrv.cpp index 0518915e81..dea07a739b 100644 --- a/audio/mididrv.cpp +++ b/audio/mididrv.cpp @@ -240,7 +240,7 @@ MidiDriver::DeviceHandle MidiDriver::detectDevice(int flags) { devStr = ConfMan.hasKey("gm_device") ? ConfMan.get("gm_device") : Common::String("null"); else devStr = "auto"; - + // Default to Null device here, since we also register a default null setting for // the MT32 or GM device in the config manager. hdl = getDeviceHandle(devStr.empty() ? Common::String("null") : devStr); |