From ae1cf334e2f96829c3cb0fb8833185a47c2602b7 Mon Sep 17 00:00:00 2001
From: Joe Taylor <joe@princeton.edu>
Date: Mon, 15 Jan 2024 13:22:45 -0500
Subject: [PATCH] Separate out the final call to timer(), using new
 "all_done()" function.

---
 qmap/libqmap/q65c.f90 | 18 ++++++++++++------
 qmap/mainwindow.cpp   |  3 +--
 qmap/mainwindow.h     |  4 ++++
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/qmap/libqmap/q65c.f90 b/qmap/libqmap/q65c.f90
index 946e57783..edf333bcb 100644
--- a/qmap/libqmap/q65c.f90
+++ b/qmap/libqmap/q65c.f90
@@ -33,12 +33,6 @@ subroutine q65c(itimer)
   nparams=nparams0                     !Copy parameters into common/npar/
   datetime(12:)='00       '
 
-  if(itimer.ne.0) then
-     call timer('decode0 ',101)
-     call fini_timer
-     return
-  endif
-
   npatience=1
   newdat=1                          !Always on ??
 
@@ -78,3 +72,15 @@ subroutine q65c(itimer)
 
   return
 end subroutine q65c
+
+subroutine all_done
+
+  use timer_module, only: timer
+  use timer_impl, only: fini_timer
+
+  call timer('decode0 ',101)
+  call fini_timer
+  print*,'All Done'
+
+  return
+end subroutine all_done
diff --git a/qmap/mainwindow.cpp b/qmap/mainwindow.cpp
index 287ff4aea..745966277 100644
--- a/qmap/mainwindow.cpp
+++ b/qmap/mainwindow.cpp
@@ -186,8 +186,7 @@ MainWindow::MainWindow(QWidget *parent) :
 MainWindow::~MainWindow()
 {
   writeSettings();
-  int one=1;
-  q65c_(&one);
+  all_done_();
 
   if (soundInThread.isRunning()) {
     soundInThread.quit();
diff --git a/qmap/mainwindow.h b/qmap/mainwindow.h
index 97a89f262..37f79548b 100644
--- a/qmap/mainwindow.h
+++ b/qmap/mainwindow.h
@@ -200,6 +200,10 @@ extern "C" {
                     const char* mygrid, int* ndop00, int len1);
 
   void q65c_(int* itimer);
+//             void q65c_(const char* fname, const char* revision, int* itimer,
+//             int len1, int len2);
+
+  void all_done_();
 
   void zaptx_(float d4[], int* k0, int* k);