Merge branch 'Development' of https://git.volian.com/Volian/SourceCode into Development

This commit is contained in:
2026-07-23 08:17:55 -04:00
7 changed files with 57 additions and 16 deletions
+4 -1
View File
@@ -652,7 +652,7 @@ namespace Volian.Controls.Library
{
//do nothing - is still checked out
}
else if (changedDocVersion && !askedAboutchangedDocVersion)
else if (changedDocVersion && !askedAboutchangedDocVersion && !ROWorkingDraftAsk.ContainsWorkingDraft(_docVersionInfo.VersionID))
{
if (MessageBox.Show($"There exists a newer ROFST for this RO database that was loaded for other sets.\r\n\r\nDo you want to update this set's ROs to be consistent/use the latest loaded ROFST?", "Load ROs", MessageBoxButtons.YesNo) == DialogResult.Yes)
{
@@ -671,10 +671,13 @@ namespace Volian.Controls.Library
updatedROs = true;
askedAboutchangedDocVersion = false;
ROWorkingDraftAsk.ClearWorkingDrafts();
}
else
{
askedAboutchangedDocVersion = true;
if (!ROWorkingDraftAsk.ContainsWorkingDraft(_docVersionInfo.VersionID))
ROWorkingDraftAsk.AddWorkingDrafts(_docVersionInfo.VersionID);
}
}