Author: ericwa
Date: Wed Mar 12 23:05:35 2014
New Revision: 10553
URL: http://svn.gna.org/viewcvs/etoile?rev=10553&view=rev
Log:
Typewriter: only commit automatic checkpoint if coalescing is on
Modified:
trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWTypewriterWindowController.m
Modified:
trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWTypewriterWindowController.m
URL:
http://svn.gna.org/viewcvs/etoile/trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWTypewriterWindowController.m?rev=10553&r1=10552&r2=10553&view=diff
==============================================================================
---
trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWTypewriterWindowController.m
(original)
+++
trunk/Etoile/Frameworks/CoreObject/Samples/Typewriter/EWTypewriterWindowController.m
Wed Mar 12 23:05:35 2014
@@ -522,17 +522,19 @@
- (void) coalescingTimer: (NSTimer *)timer
{
- NSLog(@"Breaking coalescing...");
-
- [self commitTextChangesAsCheckpoint: YES];
-
- [[self undoTrack] endCoalescing];
- [[self undoTrack] beginCoalescing];
-
- [coalescingTimer invalidate];
- coalescingTimer = nil;
- affectedText = nil;
- replacementText = nil;
+ if ([[self undoTrack] isCoalescing])
+ {
+ NSLog(@"Breaking coalescing...");
+
+ [self commitTextChangesAsCheckpoint: YES];
+
+ [[self undoTrack] endCoalescing];
+
+ [coalescingTimer invalidate];
+ coalescingTimer = nil;
+ affectedText = nil;
+ replacementText = nil;
+ }
}
_______________________________________________
Etoile-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/etoile-cvs
