Version info, UI bug fix

conor42 · Jan 30, 2018 · d9d1447 · d9d1447
1 parent 1681fa3
commit d9d1447
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 6 deletions.
diff --git a/C/7zVersion.h b/C/7zVersion.h
@@ -1,7 +1,7 @@
 #define MY_VER_MAJOR 18
 #define MY_VER_MINOR 01
 #define MY_VER_BUILD 0
-#define MY_VERSION_NUMBERS "18.01"
+#define MY_VERSION_NUMBERS "18.01 FL2 0.9.0"
 #define MY_VERSION MY_VERSION_NUMBERS
 
 #ifdef MY_CPU_NAME
@@ -10,10 +10,10 @@
   #define MY_VERSION_CPU MY_VERSION
 #endif
 
-#define MY_DATE "2018-01-28"
+#define MY_DATE "2018-01-30"
 #undef MY_COPYRIGHT
 #undef MY_VERSION_COPYRIGHT_DATE
-#define MY_AUTHOR_NAME "Igor Pavlov"
+#define MY_AUTHOR_NAME "Igor Pavlov, Conor McCarthy"
 #define MY_COPYRIGHT_PD "Igor Pavlov : Public domain"
 #define MY_COPYRIGHT_CR "Copyright (c) 1999-2018 Igor Pavlov"
 

diff --git a/C/7zVersion.rc b/C/7zVersion.rc
@@ -34,13 +34,13 @@ BEGIN \
     BEGIN  \
         BLOCK "040904b0" \
         BEGIN \
-            VALUE "CompanyName", "Igor Pavlov" \
+            VALUE "CompanyName", "Igor Pavlov, Conor McCarthy" \
             VALUE "FileDescription", descr \
             VALUE "FileVersion", MY_VERSION  \
             VALUE "InternalName", intName \
             VALUE "LegalCopyright", MY_COPYRIGHT \
             VALUE "OriginalFilename", origName \
-            VALUE "ProductName", "7-Zip" \
+            VALUE "ProductName", "7-Zip Fast-LZMA2" \
             VALUE "ProductVersion", MY_VERSION \
         END \
     END \

diff --git a/CPP/7zip/Bundles/Format7z/AMD64/7za.exp b/CPP/7zip/Bundles/Format7z/AMD64/7za.exp
diff --git a/CPP/7zip/Bundles/Format7z/AMD64/7za.lib b/CPP/7zip/Bundles/Format7z/AMD64/7za.lib
diff --git a/CPP/7zip/Bundles/Format7z/O/7za.exp b/CPP/7zip/Bundles/Format7z/O/7za.exp
diff --git a/CPP/7zip/Bundles/Format7z/O/7za.lib b/CPP/7zip/Bundles/Format7z/O/7za.lib
diff --git a/CPP/7zip/Compress/libflzma2-x64.lib b/CPP/7zip/Compress/libflzma2-x64.lib
diff --git a/CPP/7zip/UI/GUI/CompressDialog.cpp b/CPP/7zip/UI/GUI/CompressDialog.cpp
@@ -1116,7 +1116,7 @@ void CCompressDialog::SetMethod(int keepMethodId)
   {
     const NCompression::CFormatOptions &fo = m_RegistryInfo.Formats[index];
     defaultMethod = fo.Method;
-    if(fo.Method.IsEqualTo_Ascii_NoCase(kMethodsNames[kLZMA2]) == 0 && fo.Options.Find(L"mf=HC") < 0 && fo.Options.Find(L"mf=BT") < 0)
+    if(fo.Method.IsEqualTo_Ascii_NoCase(kMethodsNames[kLZMA2]) && fo.Options.Find(L"mf=HC") < 0 && fo.Options.Find(L"mf=BT") < 0)
       defaultMethod = kFastLzma2Name;
   }
   bool isSfx = IsSFX();