Merge branch 'Development' into C2026-043-Tech-Debt_v1

2026-07-21 10:38:53 -04:00
parent 9486b37300 abaf55e9b1
commit 06c3136566
4 changed files with 26 additions and 2 deletions
@@ -639,7 +639,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)
                            {
@@ -658,10 +658,13 @@ namespace Volian.Controls.Library
                                updatedROs = true;

                                askedAboutchangedDocVersion = false;
+                                ROWorkingDraftAsk.ClearWorkingDrafts();
                            }
                            else
                            {
                                askedAboutchangedDocVersion = true;
+                                if (!ROWorkingDraftAsk.ContainsWorkingDraft(_docVersionInfo.VersionID)) 
+                                    ROWorkingDraftAsk.AddWorkingDrafts(_docVersionInfo.VersionID);
                            }

                    }