From 91014b3800f20ca18b2ae0d4978230bb046ca930 Mon Sep 17 00:00:00 2001
From: Joe Taylor <k1jt@arrl.org>
Date: Mon, 10 Apr 2006 23:42:13 +0000
Subject: [PATCH] Fixed logic for transmission of test files in wsjtgen.F90.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@158 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 wsjtgen.F90 | 35 +++++++++++++++++------------------
 wsjtrc.win  |  6 +++---
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/wsjtgen.F90 b/wsjtgen.F90
index e2e695489..1ee6de1d9 100644
--- a/wsjtgen.F90
+++ b/wsjtgen.F90
@@ -60,30 +60,29 @@ subroutine wsjtgen
 
   if(msg(1:1).eq.'@') then
      if(msg(2:2).eq.'/' .or. ichar(msg(2:2)).eq.92) then
-        if(msg(2:).ne.testfile) then
-           testfile=msg(2:)
-
+        txmsg=msg
+        testfile=msg(2:)
 #ifdef Win32
-           open(18,file=testfile,form='binary',status='old',err=12)
+        open(18,file=testfile,form='binary',status='old',err=12)
 #else
-           open(18,file=testfile,form='unformatted',status='old',err=12)
+        open(18,file=testfile,form='unformatted',status='old',err=12)
 #endif
 
-           go to 14
-12         print*,'Cannot open test file ',msg(2:)
-           go to 999
-14         read(18) hdr
-           if(ndata.gt.NTxMax) ndata=NTxMax
-           call rfile(18,iwave,ndata,ierr)
-           close(18)
-           if(ierr.ne.0) print*,'Error reading test file ',msg(2:)
-           nwave=ndata/2
-           do i=nwave,NTXMAX
-              iwave(i)=0
-           enddo
-        endif
+        go to 14
+12      print*,'Cannot open test file ',msg(2:)
+        go to 999
+14      read(18) hdr
+        if(ndata.gt.NTxMax) ndata=NTxMax
+        call rfile(18,iwave,ndata,ierr)
+        close(18)
+        if(ierr.ne.0) print*,'Error reading test file ',msg(2:)
+        nwave=ndata/2
+        do i=nwave,NTXMAX
+           iwave(i)=0
+        enddo
         go to 999
      endif
+     
 
 ! Transmit a fixed tone at specified frequency
      freq=1000.0
diff --git a/wsjtrc.win b/wsjtrc.win
index 878089ec8..045f70637 100644
--- a/wsjtrc.win
+++ b/wsjtrc.win
@@ -1,6 +1,6 @@
-*font:			Arial 9
-*Label*font:		Arial 9
-*Text*font:		"Courier New" 10
+*font:			Arial 8
+*Label*font:		Arial 8
+*Text*font:		"Courier New" 9
 *background:		gray85
 *Text*background:	white
 *Entry*background:	white