From 190e58b3bfd97a5e4f94f42606c870897cbc214d Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Thu, 19 Feb 2015 15:18:47 +0000 Subject: [PATCH] Use full device path for serial port names Except on Windows where the obscure \\.\ device root is removed because Windows users will not be used to it. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4978 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- Configuration.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Configuration.cpp b/Configuration.cpp index de7d2116a..85f429f99 100644 --- a/Configuration.cpp +++ b/Configuration.cpp @@ -2381,7 +2381,9 @@ void Configuration::impl::fill_port_combo_box (QComboBox * cb) { if (!p.isBusy ()) { - cb->addItem (p.portName ()); + // remove possibly confusing Windows device path (OK because + // it gets added back by Hamlib) + cb->addItem (p.systemLocation ().remove (QRegularExpression {R"(^\\\\\.\\)"})); } } cb->addItem("USB");