Fix for pascalw#2, closes pascalw#2. Updated gitignore to exclude som…

…e XCode 4 files.
kimhunter · Mar 14, 2011 · bedc596 · bedc596
1 parent 8f4b499
commit bedc596
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,10 +2,12 @@
 *.mode2v3
 *.pbxuser
 build/
+project.xcworkspace/
+xcuserdata/
 
 # OS generated files #
 ######################
 .DS_Store?
 ehthumbs.db
 Icon?
-Thumbs.db
+Thumbs.db
diff --git a/PDColoredProgressView.m b/PDColoredProgressView.m
@@ -115,7 +115,11 @@ - (void) moveProgress
 	{
         self.progress = MIN(self.progress + 0.01, _targetProgress);
     }
-	else
+    else if(self.progress > _targetProgress)
+    {
+        self.progress = MAX(self.progress - 0.01, _targetProgress);
+    }
+    else
 	{
         [_progressTimer invalidate];
         _progressTimer = nil;