Preserve the locked state when reopening editor from history

FarGroup · Jul 13, 2021 · 775633e · 775633e
1 parent 980cfe6
commit 775633e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/far/changelog b/far/changelog
@@ -1,3 +1,8 @@
+--------------------------------------------------------------------------------
+drkns 13.07.2021 20:22:19 +0100 - build 5849
+
+4. Preserve the locked state when reopening editor from history.
+
 --------------------------------------------------------------------------------
 drkns 12.07.2021 20:53:26 +0100 - build 5848
 

diff --git a/far/cmdline.cpp b/far/cmdline.cpp
@@ -869,10 +869,11 @@ void CommandLine::ShowViewEditHistory()
 				case HR_EDITOR_RO:
 				{
 					// пусть файл создается
-					const auto FEdit = FileEditor::create(strStr, CP_DEFAULT, FFILEEDIT_CANNEWFILE | FFILEEDIT_ENABLEF6);
-
-					if (Type == HR_EDITOR_RO)
-						FEdit->SetLockEditor(true);
+					const auto FEdit = FileEditor::create(
+						strStr,
+						CP_DEFAULT,
+						FFILEEDIT_CANNEWFILE | FFILEEDIT_ENABLEF6 | (Type == HR_EDITOR_RO? FFILEEDIT_LOCKED : 0)
+					);
 
 					break;
 				}

diff --git a/far/vbuild.m4 b/far/vbuild.m4
@@ -1 +1 @@
-5848
+5849