Correction of 5855

FarGroup · Jul 26, 2021 · e15e975 · e15e975
1 parent eecbf9d
commit e15e975
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/far/changelog b/far/changelog
@@ -1,3 +1,8 @@
+--------------------------------------------------------------------------------
+drkns 26.07.2021 17:27:54 +0100 - build 5858
+
+1. Correction of 5855.
+
 --------------------------------------------------------------------------------
 drkns 25.07.2021 22:56:46 +0100 - build 5857
 

diff --git a/far/copy_progress.cpp b/far/copy_progress.cpp
@@ -67,6 +67,7 @@ namespace
 
 	enum progress_items
 	{
+		pr_console_title,
 		pr_doublebox,
 		pr_src_label,
 		pr_src_name,
@@ -95,6 +96,7 @@ copy_progress::copy_progress(bool Move, bool Total, bool Time):
 {
 	auto ProgressDlgItems = MakeDialogItems<progress_items::pr_count>(
 	{
+		{ DI_TEXT,      {{ 0, 0 }, { 0,               0 }}, DIF_HIDDEN,    {}, },
 		{ DI_DOUBLEBOX, {{ 3, 1 }, { DlgW - 4, DlgH - 2 }}, DIF_NONE,      msg(m_Move? lng::MMoveDlgTitle : lng::MCopyDlgTitle), },
 		{ DI_TEXT,      {{ 5, 2 }, { DlgW - 6,        2 }}, DIF_NONE,      msg(m_Move? lng::MCopyMoving :lng::MCopyCopying), },
 		{ DI_TEXT,      {{ 5, 3 }, { DlgW - 6,        3 }}, DIF_NONE,      {}, },
@@ -272,10 +274,10 @@ void copy_progress::Flush()
 
 	if (m_Total || (m_Files.Total == 1))
 	{
-		ConsoleTitle::SetFarTitle(concat(
+		m_Dialog->SendMessage(DM_SETTEXTPTR, progress_items::pr_console_title, UNSAFE_CSTR(concat(
 			L'{', str(m_Total? ToPercent(m_BytesTotal.Copied, m_BytesTotal.Total) : m_CurrentPercent), L"%} "sv,
 			msg(m_Move? lng::MCopyMovingTitle : lng::MCopyCopyingTitle))
-		);
+		));
 	}
 }
 

diff --git a/far/vbuild.m4 b/far/vbuild.m4
@@ -1 +1 @@
-5857
+5858