Upstream version 1.37o

src/include/version.h

@@ -2,6 +2,6 @@
 #define _VERSION_H
 
 #define FLDIGI_NAME    "fldigi"
-#define FLDIGI_VERSION "1.37n"
+#define FLDIGI_VERSION "1.37o"
 
 #endif

src/psk/psk.cxx

@@ -295,7 +295,7 @@ void psk::findsignal()
 	int searchBW = progdefaults.SearchRange + (int)(2 * bandwidth);
 	
 // fast search for peak signal frequency
-	if (sigsearch) {
+	if (sigsearch > 0) {
 		if (mailserver) { 
 // mail server signal search
 			ftest = wf->peakFreq((int)(frequency), searchBW);
@@ -306,13 +306,21 @@ void psk::findsignal()
 				if (progdefaults.PSKmailSweetSpot) {
 					if (fabs(ftest - progdefaults.PSKsweetspot) < searchBW) {
 						frequency = ftest;
-					} else
-						frequency = progdefaults.PSKmailSweetSpot;
-				} else
+						set_freq(frequency);
+						freqerr = 0.0;
+						sigsearch = 0;
+					} else {
+						frequency = progdefaults.PSKsweetspot;
+						set_freq(frequency);
+						freqerr = 0.0;
+						sigsearch--;
+					}
+				} else {
 					frequency = ftest;
-				set_freq(frequency);
-				freqerr = 0.0;
-				sigsearch--;
+					set_freq(frequency);
+					freqerr = 0.0;
+					sigsearch = 0;
+				}
 			} else { // less than the threshold
 				if (progdefaults.PSKmailSweetSpot) {
 					frequency = progdefaults.PSKsweetspot;
@@ -332,6 +340,7 @@ void psk::findsignal()
 				frequency = ftest;
 				set_freq(frequency);
 				freqerr = 0.0;
+				sigsearch = 0;
 			}
 			sigsearch--;
 		}
@@ -498,8 +507,9 @@ int psk::rx_process(double *buf, int len)
 				set_freq(frequency);
 				sigsearch = 3;
 			}
-			findsignal();
 		}
+		if (sigsearch)
+			findsignal();
 	}
 	return 0;
 }

src/waterfall/waterfall.cxx

@@ -1214,7 +1214,7 @@ int waterfall::handle(int event) {
 			case FL_LEFT_MOUSE:
 				nucarrier = wfdisp->cursorFreq(xpos);
 				active_modem->set_freq(nucarrier);
-				active_modem->set_sigsearch(5);
+				active_modem->set_sigsearch(3);
 				wfdisp->redrawCursor();
 				restoreFocus();
 				break;
@@ -1232,7 +1232,7 @@ int waterfall::handle(int event) {
 			switch (Fl::event_button()) {
 			case FL_RIGHT_MOUSE:
 				active_modem->set_freq(oldcarrier);
-				active_modem->set_sigsearch(5);
+				active_modem->set_sigsearch(3);
 				wfdisp->redrawCursor();
 				restoreFocus();
 				break;