diff --git a/LrdScrollEdit.cpp b/LrdScrollEdit.cpp index 2b3a2f9..c85bfb1 100644 --- a/LrdScrollEdit.cpp +++ b/LrdScrollEdit.cpp @@ -340,7 +340,7 @@ LrdScrollEdit::AddDatInText( { //Adds data to the DatIn buffer bool bIsEmpty = mstrDatIn.isEmpty(); - mstrDatIn += QString(baDat->replace("\r", "\n")); + mstrDatIn += QString(baDat->replace("\r\n", "\n").replace("\r", "\n")); if (bIsEmpty == true && (baDat[0] == "\r" || baDat[0] == "\n")) { //Remove first newline diff --git a/UwxMainWindow.h b/UwxMainWindow.h index 669d707..c882e7b 100644 --- a/UwxMainWindow.h +++ b/UwxMainWindow.h @@ -103,7 +103,7 @@ const qint8 MODE_UPDATE_ERROR_CODE = 16; const qint8 MODE_CHECK_FIRMWARE_VERSIONS = 17; const qint8 MODE_CHECK_FIRMWARE_SUPPORT = 18; //Constants for version and functions -const QString UwVersion = "1.09"; //Version string +const QString UwVersion = "1.09a"; //Version string //Constants for timeouts and streaming const qint16 FileReadBlock = 512; //Number of bytes to read per block when streaming files const qint16 StreamProgress = 10000; //Number of bytes between streaming progress updates diff --git a/version.rc b/version.rc index 440e613..b8a3dd6 100644 --- a/version.rc +++ b/version.rc @@ -1,8 +1,8 @@ #include VS_VERSION_INFO VERSIONINFO - FILEVERSION 1, 8, 23, 0 - PRODUCTVERSION 1, 8, 23, 0 + FILEVERSION 1, 9, 0, 0 + PRODUCTVERSION 1, 9, 0, 0 FILEFLAGSMASK 0x3fL FILEFLAGS 0 FILEOS VOS_NT_WINDOWS32 @@ -19,12 +19,12 @@ BEGIN VALUE "CompanyName", "Laird\0" VALUE "FileDescription", "UwTerminalX\0" - VALUE "FileVersion", "1.8.23.0\0" + VALUE "FileVersion", "1.9.0.0\0" VALUE "InternalName", "UwTerminalX\0" VALUE "LegalCopyright", "Copyright 2015-2017 Laird\0" VALUE "OriginalFilename", "UwTerminalX.exe\0" VALUE "ProductName", "UwTerminalX\0" - VALUE "ProductVersion", "1.8.23.0\0" + VALUE "ProductVersion", "1.9.0.0\0" END END END