X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/93a60b6d98f84d592631266e1ee0caabe3642551..b5fc132dbbed3e73887fca660c6032162adab448:/MainController.m

diff --git a/MainController.m b/MainController.m
index b9f856a..201edef 100755
--- a/MainController.m
+++ b/MainController.m
@@ -1140,8 +1140,9 @@ static MainController *sharedController;
 
 - (void)updateTime:(NSTimer *)timer
 {
+	StatusWindow *sw = [StatusWindow sharedWindow];
 	_timeUpdateCount++;
-	if (_timeUpdateCount > (int)[df floatForKey:@"statusWindowVanishDelay"] - 1) {
+	if (_timeUpdateCount < (int)[sw exitDelay] + (int)[[sw exitEffect] effectTime] + (int)[[sw entryEffect] effectTime]) {
 		NSString *time = nil;
 		NS_DURING
 			time = [NSString stringWithFormat:@"%@: %@ / %@",
@@ -1152,6 +1153,8 @@ static MainController *sharedController;
 		NS_HANDLER
 			[self networkError:localException];
 		NS_ENDHANDLER
+	} else {
+		[timer invalidate];
 	}
 }