Release 3.0.1 to fix bug in position log loading. Closes #18.

Author: baron1405

README.md

@@ -47,6 +47,10 @@ making a [financial contribution](https://github.com/sponsors/baron1405). Thank
 
 ## Changelog
 
+### Changes 3.0 to 3.0.1
+
+- Fix bug in position log loading
+
 ### Changes 2.0.1 to 3.0
 
 - Supported on Windows 10 and above.

src/meazure/VersionNumbers.h

@@ -21,7 +21,7 @@
 /// @brief This file defines the file and product version numbers. It is
 ///     included by Meazure.rc2 and becomes part of the program resources.
 
-#define FILE_VERSION            3,0,0,3
-#define PRODUCT_VERSION         3,0,0,3
-#define STR_FILE_VERSION        "3, 0, 0, 3\0"
-#define STR_PRODUCT_VERSION     "3, 0, 0, 3\0"
+#define FILE_VERSION            3,0,1,1
+#define PRODUCT_VERSION         3,0,1,1
+#define STR_FILE_VERSION        "3, 0, 1, 1\0"
+#define STR_PRODUCT_VERSION     "3, 0, 1, 1\0"

src/meazure/XMLParser.cpp

@@ -248,7 +248,8 @@ CString MeaXMLParserHandler::GetFilePathname()
 //*************************************************************************
 
 
-LPCTSTR MeaXMLParser::m_homeURL = _T("https://www.cthing.com/");
+CString MeaXMLParser::m_homeURL1(_T("https://www.cthing.com/"));
+CString MeaXMLParser::m_homeURL2(_T("http://www.cthing.com/"));
 
 
 MeaXMLParser::MeaXMLParser(MeaXMLParserHandler *handler, bool buildDOM) :
@@ -427,12 +428,19 @@ int MeaXMLParser::ExternalEntityRefHandler(XML_Parser parser,
         MeaXMLParser *ps = reinterpret_cast<MeaXMLParser*>(parser);
         CString sysId(FromUTF8(systemId));
 
-        if (sysId.Find(MeaXMLParser::m_homeURL) == 0) {
+        int homeURLPos = sysId.Find(MeaXMLParser::m_homeURL1);
+        int homeURLLen = MeaXMLParser::m_homeURL1.GetLength();
+        if (homeURLPos < 0) {
+            homeURLPos = sysId.Find(MeaXMLParser::m_homeURL2);
+            homeURLLen = MeaXMLParser::m_homeURL2.GetLength();
+        }
+
+        if (homeURLPos == 0) {
             TCHAR pathname[_MAX_PATH], drive[_MAX_DRIVE], dir[_MAX_DIR];
             GetModuleFileName(NULL, pathname, _MAX_PATH);
             _tsplitpath_s(pathname, drive, _MAX_DRIVE, dir, _MAX_DIR, NULL, 0, NULL, 0);
 
-            sysId = CString(drive) + CString(dir) + sysId.Mid(static_cast<int>(_tcslen(MeaXMLParser::m_homeURL)));
+            sysId = CString(drive) + CString(dir) + sysId.Mid(homeURLLen);
             sysId.Replace(_T('/'), _T('\\'));
 
             ps->m_pathnameStack->push(sysId);

src/meazure/XMLParser.h

@@ -542,19 +542,20 @@ class MeaXMLParser: public ev::IValidationHandler
                                      const XML_Char *dflt,
                                      int isrequired);
 
-    /// Called when an XML parsing error occurrs. Queries
+    /// Called when an XML parsing error occurs. Queries
     /// the parser to determine the error and displays a dialog
     /// with a description of the problem.
     ///
     void         HandleParserError();
 
-    /// Called when an XML validation error occurrs.
+    /// Called when an XML validation error occurs.
     ///
     /// @param error        [in] Describes the validation error.
     ///
     virtual void HandleValidationError(const ev::ValidationError& error);
 
-    static LPCTSTR          m_homeURL;          ///< URL for cthing.com
+    static CString          m_homeURL1;         ///< URL for cthing.com
+    static CString          m_homeURL2;         ///< URL for cthing.com
 
     XML_Parser              m_parser;           ///< The expat XML parser.
     bool                    m_isSubParser;      ///< Indicates whether this is an external entity sub-parser.

support/installer/Meazure.iss

@@ -5,11 +5,11 @@
 [Setup]
 AppId=Meazure
 AppName=Meazure
-AppVerName=Meazure 3.0
-AppVersion=3.0
+AppVerName=Meazure 3.0.1
+AppVersion=3.0.1
 AppMutex=MeazureInstallerMutex
 OutputDir=..\..\dist
-OutputBaseFilename=meazr30x64
+OutputBaseFilename=meazr301x64
 AppPublisher=C Thing Software
 AppPublisherURL=https://www.cthing.com
 AppSupportURL=https://www.cthing.com