From acfcd7f150a497fd8d8f67a7e007b0b885da59f1 Mon Sep 17 00:00:00 2001
From: Joe Taylor <k1jt@arrl.org>
Date: Sat, 30 Jun 2007 20:22:12 +0000
Subject: [PATCH] Fixed use of symspec with disk data; fixed Decode button
 disabling.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@451 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 decode1.F90  | 3 ++-
 getfile2.F90 | 2 +-
 map65.py     | 5 +++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/decode1.F90 b/decode1.F90
index 4ce925dbe..f83d0b611 100644
--- a/decode1.F90
+++ b/decode1.F90
@@ -19,6 +19,7 @@ subroutine decode1(iarg)
   data sending0/'                      '/
   save
 
+  kkdone=-99
   ntr0=ntr
   ns0=999999
 
@@ -32,7 +33,7 @@ subroutine decode1(iarg)
      newdat=1
   endif
 
-  if(ndecoding.eq.0 .and. ((kk-kkdone).gt.32768))           &
+  if((ndiskdat.eq.1 .or. ndecoding.eq.0) .and. ((kk-kkdone).gt.32768))  &
        call symspec(id,kbuf,kk,kkdone,nutc,t00,newdat)
 
   if(ndecoding.gt.0 .and. mode(1:4).eq.'JT65') then
diff --git a/getfile2.F90 b/getfile2.F90
index f17d3c1ba..36b10a00b 100644
--- a/getfile2.F90
+++ b/getfile2.F90
@@ -29,6 +29,7 @@ subroutine getfile2(fname,len)
   ierr=0
 
   n=8*NSMAX
+  ndecoding=4
   monitoring=0
   kbuf=1
 #ifdef Win32
@@ -50,7 +51,6 @@ subroutine getfile2(fname,len)
 
   read(filename(8:11),*) nutc
   ndiskdat=1
-  ndecoding=4
   mousebutton=0
   rxnoise=8.0
   go to 999
diff --git a/map65.py b/map65.py
index 0d0db64a6..dcb1d403b 100644
--- a/map65.py
+++ b/map65.py
@@ -1004,8 +1004,9 @@ def update():
     t="QSO DF:%4d" % (int(Audio.gcom2.mousedf),)
     msg4.configure(text=t)
 
-    if mode.get()[:4]=='JT65' and \
-        (Audio.gcom2.ndecoding or (isec>45 and  Audio.gcom2.monitoring==1)):
+    if mode.get()[:4]=='JT65' and (Audio.gcom2.ndecoding>0 or \
+         (isec>45 and  Audio.gcom2.monitoring==1 and \
+          Audio.datcom.kkdone!=-99 and Audio.gcom2.ndiskdat!=1)):
 
 #Set button bg while decoding
         bc='#66FFFF'