Release cleanup

sam210723 · Feb 16, 2019 · c1bae5a · c1bae5a
1 parent 46b6af9
commit c1bae5a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 21 deletions.
diff --git a/moRFctrl/Main.Designer.cs b/moRFctrl/Main.Designer.cs
diff --git a/moRFctrl/Main.cs b/moRFctrl/Main.cs
@@ -98,9 +98,10 @@ public void StartSweep()
         /// </summary>
         public void StopSweep()
         {
+            //TODO: Close CSV
+            //TODO: Safe thread termination (set flag, !abort)
             Program.SweepThread.Abort();
             Program.GQRXClass.Disconnect();
-            CSV.Close(Program.SweepClass.CSVFile);  //TODO: unref except
 
             EnableSweepUI();
             SweepProgress = 0;
@@ -775,6 +776,7 @@ private void linkSweepOutFile_LinkClicked(object sender, LinkLabelLinkClickedEve
             linkSweepOutFile.Text = Path.GetFileName(CSVFilePath);
 
             EnableSaveSettings();
+            btnSaveSettings_Click(null, null);
         }
 
         /// <summary>

diff --git a/moRFctrl/Program.cs b/moRFctrl/Program.cs
@@ -19,7 +19,7 @@ static class Program
         public static Thread GQRXThread;
 
         // Globals
-        public static bool debugOutput = true;
+        public static bool debugOutput = false;
         static bool isExiting = false;
 
         /// <summary>

diff --git a/moRFctrl/gqrx.cs b/moRFctrl/gqrx.cs
@@ -133,7 +133,7 @@ private void Send(string cmd, string data)
         /// </summary>
         public ulong GetFrequency()
         {
-            Console.WriteLine("GFREQ \"" + Get(CMD_FREQUENCY.ToLower() + "\"").Result);
+            Console.WriteLine("GFREQ \"" + Get(CMD_FREQUENCY.ToLower() + "\""));
             return ulong.Parse("0") * 100;
         }
 
@@ -143,13 +143,13 @@ public ulong GetFrequency()
         /// <returns>Carrier strength as string</returns>
         public string GetStrength()
         {
-            return Get(CMD_STRENGTH).Result;
+            return Get(CMD_STRENGTH);
         }
 
         /// <summary>
         /// Get Gqrx parameter
         /// </summary>
-        private async Task<string> Get(string cmd)
+        private string Get(string cmd)
         {
             if (IsConnected)
             {
@@ -158,8 +158,6 @@ private async Task<string> Get(string cmd)
                 byte[] recBuf = new byte[64];
                 string responseData = "";
 
-                //await tcpStream.FlushAsync();
-
                 try
                 {
                     int bytes = tcpStream.Read(recBuf, 0, recBuf.Length);