Merge branch 'FarGroup:master' into master

deep-soft · web-flow · commit 147e0e7b9048 · 2025-10-25T11:59:56.000+03:00
diff --git a/far/changelog b/far/changelog
@@ -1,3 +1,8 @@
+--------------------------------------------------------------------------------
+ssvine 2025-10-25 10:12:06+03:00 - build 6577
+
+1. gh-1034: Refresh plugin panel after uploading a changed file in ProcessEnter.
+
 --------------------------------------------------------------------------------
 shmuel 2025-10-24 20:22:16+03:00 - build 6576
 
diff --git a/far/filelist.cpp b/far/filelist.cpp
@@ -2842,7 +2842,19 @@ void FileList::ProcessEnter(bool EnableExec,bool SeparateWindow,bool EnableAssoc
 				{
 					int PutCode = Global->CtrlObject->Plugins->PutFiles(GetPluginHandle(), { &PanelItem.Item, 1 }, false, OPM_EDIT);
 					if (PutCode == 1 || PutCode == 2)
+					{
 						SetPluginModified();
+
+						Update(UPDATE_KEEP_SELECTION);
+						Redraw();
+						const auto AnotherPanel = Parent()->GetAnotherPanel(this);
+
+						if (AnotherPanel->GetMode() == panel_mode::NORMAL_PANEL)
+						{
+							AnotherPanel->Update(UPDATE_KEEP_SELECTION);
+							AnotherPanel->Redraw();
+						}
+					}
 				}
 			}
 		}
diff --git a/far/vbuild.m4 b/far/vbuild.m4
@@ -1 +1 @@
-6576
+6577

Original file line number	Diff line number	Diff line change
`@@ -2842,7 +2842,19 @@ void FileList::ProcessEnter(bool EnableExec,bool SeparateWindow,bool EnableAssoc`
`2842`	`2842`	`{`
`2843`	`2843`	`int PutCode = Global->CtrlObject->Plugins->PutFiles(GetPluginHandle(), { &PanelItem.Item, 1 }, false, OPM_EDIT);`
`2844`	`2844`	`if (PutCode == 1 \|\| PutCode == 2)`
	`2845`	`+ {`
`2845`	`2846`	`SetPluginModified();`
	`2847`	`+`
	`2848`	`+ Update(UPDATE_KEEP_SELECTION);`
	`2849`	`+ Redraw();`
	`2850`	`+ const auto AnotherPanel = Parent()->GetAnotherPanel(this);`
	`2851`	`+`
	`2852`	`+ if (AnotherPanel->GetMode() == panel_mode::NORMAL_PANEL)`
	`2853`	`+ {`
	`2854`	`+ AnotherPanel->Update(UPDATE_KEEP_SELECTION);`
	`2855`	`+ AnotherPanel->Redraw();`
	`2856`	`+ }`
	`2857`	`+ }`
`2846`	`2858`	`}`
`2847`	`2859`	`}`
`2848`	`2860`	`}`