From 7c0ec8716939ba2a382b7322f644051df0cbe7be Mon Sep 17 00:00:00 2001 From: mlhnet Date: Thu, 3 Sep 2015 17:49:25 -0400 Subject: [PATCH] Log event bugfix, bump version --- pc/CODEC2 GUI/CODEC2 GUI/Properties/AssemblyInfo.cs | 4 ++-- pc/CODEC2 GUI/CODEC2 GUI/dstarlistitem.cs | 8 ++++++-- .../Flex_ThumbDV_Waveform_Inno_Install_Script.iss | 6 +++++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/pc/CODEC2 GUI/CODEC2 GUI/Properties/AssemblyInfo.cs b/pc/CODEC2 GUI/CODEC2 GUI/Properties/AssemblyInfo.cs index 614bc16..5b2c9b1 100644 --- a/pc/CODEC2 GUI/CODEC2 GUI/Properties/AssemblyInfo.cs +++ b/pc/CODEC2 GUI/CODEC2 GUI/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.4.0.3")] -[assembly: AssemblyFileVersion("1.4.0.3")] +[assembly: AssemblyVersion("1.4.0.4")] +[assembly: AssemblyFileVersion("1.4.0.4")] diff --git a/pc/CODEC2 GUI/CODEC2 GUI/dstarlistitem.cs b/pc/CODEC2 GUI/CODEC2 GUI/dstarlistitem.cs index 07d918d..ba65cf5 100644 --- a/pc/CODEC2 GUI/CODEC2 GUI/dstarlistitem.cs +++ b/pc/CODEC2 GUI/CODEC2 GUI/dstarlistitem.cs @@ -253,9 +253,13 @@ namespace CODEC2_GUI // builder header StringBuilder sb = new StringBuilder(); + + // is there a message to log bool msg2snd = (messageInfo != null && messageSent == false); - // log info if we get header for third time or finally got message - bool hdr2snd = (headerInfo != null && headerSent == false && (headerCount > 0 || msg2snd)); + + // log info if we got header not logged AND (third header OR ending OR got message + bool hdr2snd = (headerInfo != null && headerSent == false && (headerCount > 3 || rxEnd || msg2snd)); + if (hdr2snd || msg2snd) sb.Append(DateTime.UtcNow.ToString("yyyy-MM-dd HH:mm:ss")); if (hdr2snd) diff --git a/pc/CODEC2 GUI/CODEC2_GUI_INSTALLER/Flex_ThumbDV_Waveform_Inno_Install_Script.iss b/pc/CODEC2 GUI/CODEC2_GUI_INSTALLER/Flex_ThumbDV_Waveform_Inno_Install_Script.iss index a2d74c3..469a189 100644 --- a/pc/CODEC2 GUI/CODEC2_GUI_INSTALLER/Flex_ThumbDV_Waveform_Inno_Install_Script.iss +++ b/pc/CODEC2 GUI/CODEC2_GUI_INSTALLER/Flex_ThumbDV_Waveform_Inno_Install_Script.iss @@ -1,7 +1,11 @@ ; +; INNO Setup Compiler Script +; for Flex DSTAR Waveform and GUI +; Author: Mark Hanson, AA3RK +; #define MyAppName "FlexRadio DSTAR Waveform" -#define MyAppVersion "1.4.0.3" +#define MyAppVersion "1.4.0.4" #define MyAppPublisher "FlexRadio Systems, LLC" #define MyAppURL "http://www.flexradio.com/" #define MyAppExeName "ThumbDV_DSTAR_GUI.exe"