Fix LT-22155: Merge entry/sense is losing some custom fields (#458)

jtmaxwell3 · web-flow · commit eeb6fc4fe9fd · 2025-09-10T10:11:01.000-07:00
diff --git a/Src/FdoUi/FdoUiCore.cs b/Src/FdoUi/FdoUiCore.cs
@@ -1155,7 +1155,11 @@ public void MergeUnderlyingObject(bool fLoseNoTextData)
 					mergeCandidates.Sort();
 					dlg.SetDlgInfo(m_cache, m_mediator, m_propertyTable, wp, dObj, mergeCandidates, guiControl, helpTopic);
 					if (DialogResult.OK == dlg.ShowDialog(mainWindow))
+					{
 						ReallyMergeUnderlyingObject(dlg.Hvo, fLoseNoTextData);
+						// Refresh in case "Sense Number" was 0 in the target and non-0 in the source (LT-22155).
+						m_mediator.SendMessage("MasterRefresh", null);
+					}
 				}
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -1155,7 +1155,11 @@ public void MergeUnderlyingObject(bool fLoseNoTextData)`
`1155`	`1155`	`mergeCandidates.Sort();`
`1156`	`1156`	`dlg.SetDlgInfo(m_cache, m_mediator, m_propertyTable, wp, dObj, mergeCandidates, guiControl, helpTopic);`
`1157`	`1157`	`if (DialogResult.OK == dlg.ShowDialog(mainWindow))`
	`1158`	`+ {`
`1158`	`1159`	`ReallyMergeUnderlyingObject(dlg.Hvo, fLoseNoTextData);`
	`1160`	`+ // Refresh in case "Sense Number" was 0 in the target and non-0 in the source (LT-22155).`
	`1161`	`+ m_mediator.SendMessage("MasterRefresh", null);`
	`1162`	`+ }`
`1159`	`1163`	`}`
`1160`	`1164`	`}`
`1161`	`1165`	`}`