Version set to 2.1-beta4

ZRCola/zrcolacomppnl.cpp

@@ -141,8 +141,8 @@ void wxZRColaComposerPanel::SynchronizePanels()
         GetTranslationSeq(sets_begin, sets_end);
 
         m_mapping.clear();
-        for (auto s = sets_end; s != sets_begin; s--) {
-            if (*s) {
+        for (auto s = sets_end; (s--) != sets_begin;) {
+            if (*s == 0) {
                 // ZRCola Decomposed => ZRCola Composed
                 app->m_t_db.TranslateInv(*s, dst.data(), dst.size(), &app->m_lc_db, app->m_mainWnd->m_settings->m_lang, dst2, &map);
             } else {

include/version.h

@@ -23,7 +23,7 @@
 // Product version as a single DWORD
 // Note: Used for version comparison within C/C++ code.
 //
-#define PRODUCT_VERSION          0x02000300
+#define PRODUCT_VERSION          0x02000400
 
 //
 // Product version by components
@@ -33,26 +33,26 @@
 //
 #define PRODUCT_VERSION_MAJ      2
 #define PRODUCT_VERSION_MIN      0
-#define PRODUCT_VERSION_REV      3
+#define PRODUCT_VERSION_REV      4
 #define PRODUCT_VERSION_BUILD    0
 
 //
 // Human readable product version and build year for UI
 //
-#define PRODUCT_VERSION_STR      "2.1-beta3"
+#define PRODUCT_VERSION_STR      "2.1-beta4"
 #define PRODUCT_BUILD_YEAR_STR   "2017"
 
 //
 // Numerical version presentation for ProductVersion propery in
 // MSI packages (syntax: N.N[.N[.N]])
 //
-#define PRODUCT_VERSION_INST     "2.0.3"
+#define PRODUCT_VERSION_INST     "2.0.4"
 
 //
 // The product code for ProductCode property in MSI packages
 // Replace with new on every version change, regardless how minor it is.
 //
-#define PRODUCT_VERSION_GUID     "{7E9E149C-915E-4235-8D26-BE7CF7D6FA5E}"
+#define PRODUCT_VERSION_GUID     "{A8D9D847-104D-43AF-9AA2-79B486D6A4BB}"
 
 //
 // The product vendor and application name for configuration keeping.

lib/libZRCola/src/translate.cpp

@@ -125,7 +125,7 @@ void ZRCola::translation_db::TranslateInv(_In_ transetid_t set, _In_z_count_(inp
     for (size_t i = 0; i < inputMax;) {
         // Find the longest matching inverse translation at i-th character.
         size_t l_match = (size_t)-1;
-        for (size_t l = 0, r = r_set, ii = i, j = 0; ii < inputMax && l < r; ii++, j++) {
+        for (size_t l = l_set, r = r_set, ii = i, j = 0; ii < inputMax && l < r; ii++, j++) {
             wchar_t c = input[ii];
             while (l < r) {
                 // Test the inverse translation in the middle of the search area.