From 14477ac80c3afd50f91c0446d19a22b0ab2cbdf5 Mon Sep 17 00:00:00 2001 From: Stephen Anthony Date: Sat, 24 Oct 2020 17:02:17 -0230 Subject: [PATCH] Revert "Revert change in serial port autodetection that was causing the real serial port to not be found." This reverts commit 235539a3313b5d9725dfee8c57c74d2ca9203d51. The previous code works better for our use case. --- src/emucore/OSystem.cxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/emucore/OSystem.cxx b/src/emucore/OSystem.cxx index 497ebb8e0..611439e45 100644 --- a/src/emucore/OSystem.cxx +++ b/src/emucore/OSystem.cxx @@ -193,9 +193,10 @@ bool OSystem::create() // Detect serial port for AtariVox-USB // If a previously set port is defined, use it; // otherwise use the first one found (if any) - StringList ports = MediaFactory::createSerialPort()->portNames(); - bool oldPortFound = BSPF::contains(ports, mySettings->getString("avoxport")); - if(!oldPortFound && ports.size() > 0) + const string& avoxport = mySettings->getString("avoxport"); + const StringList ports = MediaFactory::createSerialPort()->portNames(); + + if(avoxport.empty() && ports.size() > 0) mySettings->setValue("avoxport", ports[0]); return true;