Commit ff8aa66e authored by Michael Schwarz's avatar Michael Schwarz

switching tabs no longer aborts connected resolution

parent 77fa3826
...@@ -209,7 +209,7 @@ public class CupConflictsView extends FailableView implements ICupEditorPageVisi ...@@ -209,7 +209,7 @@ public class CupConflictsView extends FailableView implements ICupEditorPageVisi
panel.update(crm, conflict); panel.update(crm, conflict);
} }
if(this.connectedResolutionAbort.getVisible()) { if(currentPrecs != null && currentPrecs.isActive()) {
markAllAffected(); markAllAffected();
} }
...@@ -335,7 +335,7 @@ public class CupConflictsView extends FailableView implements ICupEditorPageVisi ...@@ -335,7 +335,7 @@ public class CupConflictsView extends FailableView implements ICupEditorPageVisi
@Override @Override
public void modelChanged(Model model) { public void modelChanged(Model model) {
if(this.connectedResolutionAbort.getVisible()) { if(currentPrecs != null & currentPrecs.isActive()) {
// Connected resolution does no longer make sense // Connected resolution does no longer make sense
abortConnectedResolution(false); abortConnectedResolution(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