merge commit
authordadubrow
Fri, 07 Aug 2009 15:50:06 -0500
changeset 396 2ee12718a766
parent 395 56887eb7b034 (diff)
parent 394 6b88a951e72a (current diff)
child 397 5354388b2a6b
child 398 d0373668f9ff
child 400 9b005a8e6778
merge commit
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/editors/common/CarbideFormEditor.java	Fri Aug 07 15:25:12 2009 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/editors/common/CarbideFormEditor.java	Fri Aug 07 15:50:06 2009 -0500
@@ -188,9 +188,6 @@
 		baseEditorContext.textEditorContext = undoManager.getUndoContext();
 		baseEditorContext.allContext.addMatch(baseEditorContext.textEditorContext);
 		baseEditorContext.modelOperationContext.addMatch(baseEditorContext.textEditorContext);
-		
-		// mark the buffer dirty to inhibit auto-reload. See comments on setBufferDirty
-		textEditorPage.setBufferDirty(true);
 	}
 	
 	@Override
@@ -236,6 +233,8 @@
 			// user must have undone everything.
 			result = true;
 		}
+		// mark the buffer dirty to inhibit auto-reload. See comments on setBufferDirty
+		textEditorPage.setBufferDirty(result);
 		return result;
 	}