Fixed bug between XML files and active edit boxes

thisismy-github · Ibuprophen · commit 68379f409858 · 2022-08-13T16:00:26.000-04:00
When loading XML files, settings with active edit boxes open will not be
adjusted. This adds an additional tab-reload before the load begins to
forcibly close any active edit boxes.
diff --git a/Src/Lib/Settings.cpp b/Src/Lib/Settings.cpp
@@ -1713,6 +1713,7 @@ LRESULT CSettingsDlg::OnBackup( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL&
 		ofn.Flags=OFN_DONTADDTORECENT|OFN_ENABLESIZING|OFN_EXPLORER|OFN_FILEMUSTEXIST|OFN_HIDEREADONLY|OFN_NOCHANGEDIR;
 		if (GetOpenFileName(&ofn))
 		{
+			SetCurTab(m_Index,true); // reload tab once to force-close any active edit boxes
 			CString error=g_SettingsManager.LoadSettingsXml(path);
 			if (!error.IsEmpty())
 			{
@@ -1722,7 +1723,7 @@ LRESULT CSettingsDlg::OnBackup( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL&
 				::MessageBox(m_hWnd,text,LoadStringEx(IDS_ERROR_TITLE),MB_OK|MB_ICONERROR);
 			}
 			SetSettingsDirty();
-			SetCurTab(m_Index,true);
+			SetCurTab(m_Index,true); // reload tab again to show the new settings
 		}
 	}
 	if (res==3)

Original file line number	Diff line number	Diff line change
`@@ -1713,6 +1713,7 @@ LRESULT CSettingsDlg::OnBackup( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL&`
`1713`	`1713`	`ofn.Flags=OFN_DONTADDTORECENT\|OFN_ENABLESIZING\|OFN_EXPLORER\|OFN_FILEMUSTEXIST\|OFN_HIDEREADONLY\|OFN_NOCHANGEDIR;`
`1714`	`1714`	`if (GetOpenFileName(&ofn))`
`1715`	`1715`	`{`
	`1716`	`+ SetCurTab(m_Index,true); // reload tab once to force-close any active edit boxes`
`1716`	`1717`	`CString error=g_SettingsManager.LoadSettingsXml(path);`
`1717`	`1718`	`if (!error.IsEmpty())`
`1718`	`1719`	`{`
`@@ -1722,7 +1723,7 @@ LRESULT CSettingsDlg::OnBackup( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL&`
`1722`	`1723`	`::MessageBox(m_hWnd,text,LoadStringEx(IDS_ERROR_TITLE),MB_OK\|MB_ICONERROR);`
`1723`	`1724`	`}`
`1724`	`1725`	`SetSettingsDirty();`
`1725`		`- SetCurTab(m_Index,true);`
	`1726`	`+ SetCurTab(m_Index,true); // reload tab again to show the new settings`
`1726`	`1727`	`}`
`1727`	`1728`	`}`
`1728`	`1729`	`if (res==3)`