Commit dc2eebf3 authored by Michael Schwarz's avatar Michael Schwarz

abort resolution of connected if switching tabs instead of throwing

error (temporary, chnage later)
parent 7af34a86
......@@ -1054,14 +1054,14 @@ public class CupConflictsView extends FailableView implements ICupEditorPageVisi
int size = conflicts.size();
matchPanelNumber(size);
terminalsAffectConflicts = new HashMap<>();
// Do this first, otherwise the affects others is wrong because it operates on a subset of actual terminals
terminalsAffectConflicts = new HashMap<>();
for (int i = 0; i < size; i++) {
Conflict conflict = conflicts.get(i);
addToTerminalSet(crm,conflict);
}
System.out.println("UI");
for (int i = 0; i < size; i++) {
Conflict conflict = conflicts.get(i);
ConflictPanel panel = conflictPanels.get(i);
......@@ -1193,6 +1193,8 @@ public class CupConflictsView extends FailableView implements ICupEditorPageVisi
@Override
public void becameHidden() {
//TODO: This is too drastic, if nothing changed we can allow the user to switch back and forth
abortConnectedResolution();
this.isVisible = false;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment