From 7995a29a16565561fe9741e338f75c4edb6e2df7 Mon Sep 17 00:00:00 2001
From: Alex Alabuzhev <alabuzhev@gmail.com>
Date: Tue, 2 Feb 2016 20:22:21 +0000
Subject: [PATCH] =?UTF-8?q?=D0=A1=20=D1=84=D0=BE=D1=80=D1=83=D0=BC=D0=B0:?=
 =?UTF-8?q?=20=D0=B7=D0=B0=D0=BF=D1=83=D1=81=D0=BA=20far=20/v=20=D0=B8?=
 =?UTF-8?q?=D0=BB=D0=B8=20far=20/e=20=D0=BF=D1=80=D0=B8=20=D0=B2=D0=BA?=
 =?UTF-8?q?=D0=BB=D1=8E=D1=87=D0=B5=D0=BD=D0=BD=D0=BE=D0=BC=20=D0=B0=D0=B2?=
 =?UTF-8?q?=D1=82=D0=BE=D1=81=D0=BE=D1=85=D1=80=D0=B0=D0=BD=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B8=20=D1=81=D0=B1=D0=B8=D0=B2=D0=B0=D0=BB=20=D0=BD?=
 =?UTF-8?q?=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B8=20=D0=BF=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B5=D0=BB=D0=B5=D0=B9.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 far/changelog   |  6 +++++-
 far/ctrlobj.cpp | 13 ++++---------
 far/vbuild.m4   |  2 +-
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/far/changelog b/far/changelog
index cf9532a3c5..94ff9f6b58 100644
--- a/far/changelog
+++ b/far/changelog
@@ -1,4 +1,8 @@
-drkns 02.02.2016 21:34:08 +0200 - build 4534
+drkns 02.02.2016 22:19:45 +0200 - build 4535
+
+1. С форума: запуск far /v или far /e при включенном автосохранении сбивал настройки панелей.
+
+drkns 02.02.2016 21:34:08 +0200 - build 4534
 
 1. Уточнение 4525 для нетривиальных условий запуска.
 
diff --git a/far/ctrlobj.cpp b/far/ctrlobj.cpp
index c18bdf3475..0f648a4b98 100644
--- a/far/ctrlobj.cpp
+++ b/far/ctrlobj.cpp
@@ -103,11 +103,6 @@ void ControlObject::Init(int DirCount)
 	FPanels->LeftPanel()->SetCustomSortMode(Global->Opt->LeftPanel.SortMode, true);
 	FPanels->RightPanel()->SetCustomSortMode(Global->Opt->RightPanel.SortMode, true);
 	Global->WindowManager->SwitchToPanels();  // otherwise panels are empty
-	/*
-		FarChDir(StartCurDir);
-	*/
-//  _SVS(SysLog(L"ActivePanel->GetCurDir='%s'",StartCurDir));
-//  _SVS(char PPP[NM];Cp()->GetAnotherPanel(Cp()->ActivePanel)->GetCurDir(PPP);SysLog(L"AnotherPanel->GetCurDir='%s'",PPP));
 }
 
 void ControlObject::CreateDummyFilePanels()
@@ -122,19 +117,19 @@ ControlObject::~ControlObject()
 
 	_OT(SysLog(L"[%p] ControlObject::~ControlObject()", this));
 
-	if (Cp() && Cp()->ActivePanel())
+	// dummy_panel indicates /v or /e mode
+	if (FPanels && FPanels->ActivePanel() && !std::dynamic_pointer_cast<dummy_panel>(FPanels->ActivePanel()))
 	{
 		if (Global->Opt->AutoSaveSetup)
 			Global->Opt->Save(false);
 
-		if (Cp()->ActivePanel()->GetMode() != panel_mode::PLUGIN_PANEL)
+		if (FPanels->ActivePanel()->GetMode() != panel_mode::PLUGIN_PANEL)
 		{
-			FolderHistory->AddToHistory(Cp()->ActivePanel()->GetCurDir());
+			FolderHistory->AddToHistory(FPanels->ActivePanel()->GetCurDir());
 		}
 	}
 
 	Global->WindowManager->CloseAll();
-	FPanels=nullptr;
 	FileFilter::CloseFilter();
 	History::CompactHistory();
 	FilePositionCache::CompactHistory();
diff --git a/far/vbuild.m4 b/far/vbuild.m4
index 4ac0c432a3..932a768325 100644
--- a/far/vbuild.m4
+++ b/far/vbuild.m4
@@ -1 +1 @@
-m4_define(BUILD,4534)m4_dnl
+m4_define(BUILD,4535)m4_dnl