Attachment #176547 for bug #322329

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 366-376 Link Here

(-)compare/org/eclipse/compare/internal/CompareEditor.java (-2 / +8 lines)
366	newState[0] = CANCELED;	366	newState[0] = CANCELED;
367	Display.getDefault().syncExec(new Runnable() {	367	Display.getDefault().syncExec(new Runnable() {
368	public void run() {	368	public void run() {
		369	if (fPageBook.isDisposed())
		370	return;
369	// we need to register the saveable if we had a previous input or if	371	// we need to register the saveable if we had a previous input or if
370	// there are knownSaveables (which means that the workbench called	372	// there are knownSaveables (which means that the workbench called
371	// getSaveables and got an empty list	373	// getSaveables and got an empty list
372	if (monitor.isCanceled() \|\| fPageBook.isDisposed())
373	return;
374	if (hadPreviousInput \|\| (knownSaveables != null && !isAllSaveablesKnown())) {	374	if (hadPreviousInput \|\| (knownSaveables != null && !isAllSaveablesKnown())) {
375	registerSaveable();	375	registerSaveable();
376	}	376	}
Lines 448-453 Link Here
448	closeEditor();	448	closeEditor();
449	}	449	}
450	} else if (fControl == null && getState() != CREATING_CONTROL) {	450	} else if (fControl == null && getState() != CREATING_CONTROL) {
		451	if (getState() == CANCELED) {
		452	// Close the editor when we are canceled, even when compare
		453	// result has been already prepared
		454	closeEditor();
		455	return;
		456	}
451	// Set the state in case this method gets called again	457	// Set the state in case this method gets called again
452	setState(CREATING_CONTROL);	458	setState(CREATING_CONTROL);
453	if (getSite().getSelectionProvider() == null)	459	if (getSite().getSelectionProvider() == null)

Return to bug 322329