From 0c1f236a4d166f9388b89544659122e06fba9bc5 Mon Sep 17 00:00:00 2001
From: Alex Alabuzhev <alabuzhev@gmail.com>
Date: Sat, 9 Jul 2016 19:58:57 +0000
Subject: [PATCH] fix load ansi plugins with non-perfect resources

---
 far/PluginA.cpp | 8 ++++----
 far/changelog   | 4 ++++
 far/vbuild.m4   | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/far/PluginA.cpp b/far/PluginA.cpp
index 993eb3b8d2..122210399b 100644
--- 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
index b3044423bf..f633a10a2d 100644
--- 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
index f87ac27272..00dfd1e435 100644
--- a/far/vbuild.m4
+++ b/far/vbuild.m4
@@ -1 +1 @@
-m4_define(BUILD,4741)m4_dnl
+m4_define(BUILD,4742)m4_dnl