plugin loading correction

FarGroup · May 16, 2017 · 47ea439 · 47ea439
1 parent 9da02f3
commit 47ea439
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/far/changelog b/far/changelog
@@ -1,3 +1,7 @@
+drkns 16.05.2017 07:34:39 +0000 - build 4962
+
+1. Уточение процесса загрузки плагинов.
+
 drkns 15.05.2017 14:39:00 +0000 - build 4961
 
 1. Продолжение 4959 - отображением ошибок загрузки плагинов теперь заведует соответствующий загрузчик,

diff --git a/far/plclass.cpp b/far/plclass.cpp
@@ -584,14 +584,19 @@ bool Plugin::LoadData()
 		strDescription = Info.Description;
 		strAuthor = Info.Author;
 
-		bool ok=true;
-		if(m_Guid != FarGuid && m_Guid != Info.Guid)
-		{
-			ok = m_Factory->GetOwner()->UpdateId(this, Info.Guid);
-		}
-		else
+		bool ok = false;
+
+		if (Info.Guid != FarGuid)
 		{
-			SetGuid(Info.Guid);
+			if (m_Guid != FarGuid && m_Guid != Info.Guid)
+			{
+				ok = m_Factory->GetOwner()->UpdateId(this, Info.Guid);
+			}
+			else
+			{
+				SetGuid(Info.Guid);
+				ok = true;
+			}
 		}
 
 		if (ok)

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