Merge branch '2817-TransitioningContentControl-TransitionCompleted-fi…

…x' into develop
MahApps · Jan 27, 2017 · e0a01ef · e0a01ef
2 parents eb7cd4b + 224c283
commit e0a01ef
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/MahApps.Metro/MahApps.Metro.Shared/Controls/TransitioningContentControl.cs b/src/MahApps.Metro/MahApps.Metro.Shared/Controls/TransitioningContentControl.cs
@@ -329,8 +329,12 @@ public void ReloadTransition()
 
         private void OnTransitionCompleted(object sender, EventArgs e)
         {
+            var clockGroup = sender as ClockGroup;
             this.AbortTransition();
-            this.TransitionCompleted?.Invoke(this, new RoutedEventArgs());
+            if (clockGroup == null || clockGroup.CurrentState == ClockState.Stopped)
+            {
+                this.TransitionCompleted?.Invoke(this, new RoutedEventArgs());
+            }
         }
 
         public void AbortTransition()