Change to correct bug when CI-V is user-specified and rigCaps were never

populated.

rigcommander.cpp

@@ -2827,6 +2827,11 @@ void rigCommander::determineRigCaps()
         qInfo(logRig()) << "Using incomingCIVAddr: (int): " << this->civAddr << " hex: " << hex << this->civAddr;
         emit discoveredRigID(rigCaps);
     } else {
+        if(!foundRig)
+        {
+            emit discoveredRigID(rigCaps);
+            foundRig = true;
+        }
         emit haveRigID(rigCaps);
     }
 }

wfmain.cpp

@@ -792,6 +792,7 @@ void wfmain::receiveCommReady()
         // don't bother, they told us the CIV they want, stick with it.
         // We still query the rigID to find the model, but at least we know the CIV.
         qInfo(logSystem()) << "Skipping automatic CIV, using user-supplied value of " << prefs.radioCIVAddr;
+        emit getRigID();
         getInitialRigState();
     }
 
@@ -813,7 +814,7 @@ void wfmain::receiveFoundRigID(rigCapabilities rigCaps)
         if(prefs.serialPortBaud < 115200)
         {
             delayedCommand->setInterval(delayedCmdIntervalSerial_ms*2);
-            periodicPollingTimer->setInterval(100); // slower for s-meter polling
+            periodicPollingTimer->setInterval(200); // slower for s-meter polling
         } else {
             delayedCommand->setInterval(delayedCmdIntervalSerial_ms);
         }