From 3f0701cca0c89d67ec42d850c4e0c503c09b5cf8 Mon Sep 17 00:00:00 2001
From: Stelios Bounanos <vcs@enotty.net>
Date: Thu, 27 Dec 2007 16:34:25 +0000
Subject: [PATCH] Upstream version 2.07

---
 ChangeLog               |  3 +++
 configure.ac            |  2 +-
 src/dialogs/fl_digi.cxx |  1 +
 src/misc/pskmail.cxx    | 25 ++++++++++++++-----------
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2d76d520..6f594b52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 Change Log:
 
+2.07  1) bug fix for mode changes via SysV interface (pskmail / flarq)
+      2) bug fix for modem configuration post quick change from status
+         bar using mouse wheel.
 2.06  1) Source code fixes for 64 bit compilers
       2) New stacktrace code, used by default exception & signal handlers
       3) LDT / ZDT: locale settings are now recognized in macro expansion.
diff --git a/configure.ac b/configure.ac
index 80525142..2203296e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 # Copyright (C) 2007 Stelios Bounanos, M0GLD (m0gld AT enotty DOT net)
 
 AC_PREREQ(2.61)
-AC_INIT([fldigi], [2.06], [w1hkj AT w1hkj DOT com])
+AC_INIT([fldigi], [2.07], [w1hkj AT w1hkj DOT com])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([-Wall foreign 1.9.6])
 AM_MAINTAINER_MODE
diff --git a/src/dialogs/fl_digi.cxx b/src/dialogs/fl_digi.cxx
index 8cd489c8..4ea737d4 100644
--- a/src/dialogs/fl_digi.cxx
+++ b/src/dialogs/fl_digi.cxx
@@ -675,6 +675,7 @@ void cb_QRZ(Fl_Widget *b, void *)
 void status_cb(Fl_Widget *b, void *arg)
 {
         if (Fl::event_button() == FL_RIGHT_MOUSE) {
+				progdefaults.loadDefaults();
                 tabsConfigure->value(tabModems);
                 tabsModems->value(modem_config_tab);
                 dlgConfig->show();
diff --git a/src/misc/pskmail.cxx b/src/misc/pskmail.cxx
index 533ba2b9..aad81657 100644
--- a/src/misc/pskmail.cxx
+++ b/src/misc/pskmail.cxx
@@ -24,18 +24,21 @@ bool pskmail_text_available = false;
 
 void ParseMode(string src)
 {
+	if (src.find("PTTTUNE") != string::npos) {
+		int msecs = 100;
+		if (src.length() > 7)
+			sscanf( src.substr(7, src.length() - 7).c_str(), "%d", &msecs);
+		push2talk->set(true);
+		MilliSleep(msecs);
+		push2talk->set(false);
+		return;
+	}
 	for (size_t i = 0; i < NUM_MODES; ++i) {
-		if (src.find(mode_info[i].pskmail_name) != string::npos)
-			init_modem(mode_info[i].mode);
-		else if (src.find("PTTTUNE") != string::npos) {
-			int msecs = 100;
-			if (src.length() > 7)
-				sscanf( src.substr(7, src.length() - 7).c_str(), "%d", &msecs);
-			push2talk->set(true);
-			MilliSleep(msecs);
-			push2talk->set(false);
-		}
-		break;
+		if (strlen(mode_info[i].pskmail_name) > 0) 
+			if (src.find(mode_info[i].pskmail_name) != string::npos) {
+				init_modem(mode_info[i].mode);
+				break;
+			}
 	}
 }