From c9e94caefb9d9c5069d379b5fce2f6ef89e07cd2 Mon Sep 17 00:00:00 2001
From: Alex Alabuzhev <alabuzhev@gmail.com>
Date: Tue, 29 Jun 2021 23:22:24 +0100
Subject: [PATCH] And more

---
 far/changelog    | 5 +++++
 far/filelist.cpp | 3 +--
 far/vbuild.m4    | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/far/changelog b/far/changelog
index 0d71688fa3..daf57ee967 100644
--- a/far/changelog
+++ b/far/changelog
@@ -1,3 +1,8 @@
+--------------------------------------------------------------------------------
+drkns 29.06.2021 23:22:07 +0100 - build 5841
+
+1. And more.
+
 --------------------------------------------------------------------------------
 drkns 29.06.2021 17:58:00 +0100 - build 5840
 
diff --git a/far/filelist.cpp b/far/filelist.cpp
index 8ad8ff0294..739949e12a 100644
--- a/far/filelist.cpp
+++ b/far/filelist.cpp
@@ -2778,8 +2778,6 @@ void FileList::ProcessEnter(bool EnableExec,bool SeparateWindow,bool EnableAssoc
 
 bool FileList::SetCurDir(string_view const NewDir, bool ClosePanel, bool IsUpdated, bool const Silent)
 {
-	Panel::SetCurDir(NewDir, ClosePanel, IsUpdated, Silent);
-
 	UserDataItem UsedData{};
 
 	if (m_PanelMode == panel_mode::PLUGIN_PANEL)
@@ -2821,6 +2819,7 @@ bool FileList::SetCurDir(string_view const NewDir, bool ClosePanel, bool IsUpdat
 
 	if (!NewDir.empty())
 	{
+		Panel::SetCurDir(NewDir, ClosePanel, IsUpdated, Silent);
 		return ChangeDir(NewDir, NewDir == L".."sv, true, IsUpdated, &UsedData, OFP_NORMAL, Silent);
 	}
 
diff --git a/far/vbuild.m4 b/far/vbuild.m4
index e44974ebbe..127482e3eb 100644
--- a/far/vbuild.m4
+++ b/far/vbuild.m4
@@ -1 +1 @@
-5840
+5841