diff --git a/configure.ac b/configure.ac index 8c5f07b9..aacd9c08 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl major and minor must be integers; patch may dnl contain other characters or be empty m4_define(FLDIGI_MAJOR, [2]) m4_define(FLDIGI_MINOR, [11]) -m4_define(FLDIGI_PATCH, [I]) +m4_define(FLDIGI_PATCH, [J]) AC_INIT([fldigi], FLDIGI_MAJOR.FLDIGI_MINOR[FLDIGI_PATCH], [w1hkj AT w1hkj DOT com]) diff --git a/src/misc/pskmail.cxx b/src/misc/pskmail.cxx index d2be462f..9945bb3a 100644 --- a/src/misc/pskmail.cxx +++ b/src/misc/pskmail.cxx @@ -66,9 +66,9 @@ void parse_mailtext() strCmdText = mailtext.substr(idxCmd + 5, idxCmdEnd - idxCmd - 5); if (strCmdText == "server" && mailserver == false && mailclient == false) { mailserver = true; - mailclient = false; + mailclient = false; #ifndef __CYGWIN__ - std::cout << "Starting pskmail server transport layer" << std::endl; std::cout.flush(); + std::cout << "Starting pskmail server transport layer" << std::endl; std::cout.flush(); #endif string PskMailLogName = PskMailDir; PskMailLogName += "gMFSK.log"; @@ -78,7 +78,7 @@ void parse_mailtext() mailclient = true; mailserver = false; #ifndef __CYGWIN__ - std::cout << "Starting pskmail client transport layer" << std::endl; std::cout.flush(); + std::cout << "Starting pskmail client transport layer" << std::endl; std::cout.flush(); #endif string PskMailLogName = PskMailDir; PskMailLogName += "gMFSK.log"; @@ -86,7 +86,7 @@ void parse_mailtext() Maillogfile->log_to_file_start(); } else if (strCmdText == "normal") { #ifndef __CYGWIN__ - std::cout << "Closing pskmail transport layer" << std::endl; std::cout.flush(); + std::cout << "Closing pskmail transport layer" << std::endl; std::cout.flush(); #endif mailserver = false; mailclient = false; @@ -153,10 +153,10 @@ void initFilePtr() fseek(infile, 0, SEEK_END); infileptr = ftell(infile); fclose(infile); - } - bInitFilePtr = true; + } + bInitFilePtr = true; #ifndef __CYGWIN__ -std::cout << "Init file pointer = " << infileptr << std::endl; std::cout.flush(); +std::cout << "Init file pointer = " << infileptr << std::endl; std::cout.flush(); #endif } #endif @@ -223,7 +223,7 @@ void check_formail() { } } #else -// Windows file handling for input strings +// Windows file handling for input strings FILE *infile; infile = fopen(str_infile.c_str(), "rb"); if (infile) { @@ -294,9 +294,9 @@ void pskmail_loop(void *) if (bInitFilePtr == false) initFilePtr(); #endif -// if (bSend0x06) -// send0x06(); -// check_formail(); + if (bSend0x06) + send0x06(); + check_formail(); Fl::repeat_timeout(0.2, pskmail_loop);//1.0, pskmail_loop); }