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