--- libs/ardour/globals.cc 2007-08-22 00:37:47.000000000 +0200 +++ libs/ardour/globals.cc.oden 2007-08-22 00:52:34.000000000 +0200 @@ -110,9 +110,8 @@ setup_midi () { std::map<string,Configuration::MidiPortDescriptor*>::iterator i; - int nports; - if ((nports = Config->midi_ports.size()) == 0) { + if (Config->midi_ports.size() == 0) { warning << _("no MIDI ports specified: no MMC or MTC control possible") << endmsg; return 0; } @@ -133,15 +132,14 @@ } MIDI::Manager::instance()->add_port (request); - - nports++; } MIDI::Port* first; const MIDI::Manager::PortMap& ports = MIDI::Manager::instance()->get_midi_ports(); - first = ports.begin()->second; - if (nports > 1) { + if (ports.size() > 1) { + + first = ports.begin()->second; /* More than one port, so try using specific names for each port */ @@ -173,7 +171,9 @@ default_midi_port = first; } - } else { + } else if (ports.size() == 1) { + + first = ports.begin()->second; /* Only one port described, so use it for both MTC and MMC */