mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2026-07-12 05:44:06 -04:00
Merging from trunk:
------------------------------------------------------------------------ r7896 | bsomervi | 2017-07-16 15:32:28 +0100 (Sun, 16 Jul 2017) | 5 lines Improve support for older C++ compilers Some current Linux distributions are still using GCC 4.6 which has no/poor C++11 support. probably more of this needed if we are to support such compilers. ------------------------------------------------------------------------ r7897 | bsomervi | 2017-07-16 15:32:48 +0100 (Sun, 16 Jul 2017) | 3 lines Improved rig control start up behavour Avoid trying to set bogus uninitialized frequency values. ------------------------------------------------------------------------ git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx-1.8@7898 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
+3
-1
@@ -86,7 +86,9 @@ void TransceiverBase::set (TransceiverState const& s,
|
||||
requested_.frequency (actual_.frequency ());
|
||||
requested_.mode (actual_.mode ());
|
||||
}
|
||||
if (!s.tx_frequency () || s.tx_frequency () > 10000) // ignore bogus startup values
|
||||
if (!s.tx_frequency ()
|
||||
|| (s.tx_frequency () > 10000 // ignore bogus startup values
|
||||
&& s.tx_frequency () < std::numeric_limits<Frequency>::max () - 10000))
|
||||
{
|
||||
if ((s.tx_frequency () != requested_.tx_frequency () // and QSY
|
||||
|| (s.mode () != UNK && s.mode () != requested_.mode ())) // or mode change
|
||||
|
||||
Reference in New Issue
Block a user