fix load ansi plugins with non-perfect resources

FarGroup · Jul 9, 2016 · 0c1f236 · 0c1f236
1 parent 3dab70d
commit 0c1f236
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/far/PluginA.cpp b/far/PluginA.cpp
@@ -5207,19 +5207,19 @@ bool PluginA::GetGlobalInfo(GlobalInfo* Info)
 	if (FileVersion->Read())
 	{
 		const wchar_t* Value;
-		if ((Value = FileVersion->GetStringValue(L"InternalName")) != nullptr || (Value = FileVersion->GetStringValue(L"OriginalName")) != nullptr)
+		if (((Value = FileVersion->GetStringValue(L"InternalName")) != nullptr || (Value = FileVersion->GetStringValue(L"OriginalName")) != nullptr) && *Value)
 		{
 			Info->Title = Value;
 		}
 
-		if ((Value = FileVersion->GetStringValue(L"CompanyName")) != nullptr || (Value = FileVersion->GetStringValue(L"LegalCopyright")) != nullptr)
+		if (((Value = FileVersion->GetStringValue(L"CompanyName")) != nullptr || (Value = FileVersion->GetStringValue(L"LegalCopyright")) != nullptr) && *Value)
 		{
 			Info->Author = Value;
 		}
 
-		if (const auto Description = FileVersion->GetStringValue(L"FileDescription"))
+		if ((Value = FileVersion->GetStringValue(L"FileDescription")) != nullptr && *Value)
 		{
-			Info->Description = Description;
+			Info->Description = Value;
 		}
 
 		if (const auto Uuid = FileVersion->GetStringValue(L"PluginGUID"))

diff --git a/far/changelog b/far/changelog
@@ -1,3 +1,7 @@
+drkns 09.07.2016 22:56:35 +0200 - build 4742
+
+1. Ansi-плагины, у которых ресурсы недостаточно хороши, могли не загружаться.
+
 drkns 09.07.2016 01:21:52 +0200 - build 4741
 
 1. И ещё один баг там же.

diff --git a/far/vbuild.m4 b/far/vbuild.m4
@@ -1 +1 @@
-m4_define(BUILD,4741)m4_dnl
+m4_define(BUILD,4742)m4_dnl