don't pass NULL pointer to printf(), this crashes Solaris printf

[wxWidgets.git] / contrib / src / animate / animate.cpp

diff --git a/contrib/src/animate/animate.cpp b/contrib/src/animate/animate.cpp
index 5c687f927a0f9c85ba257f2d1e18e3eadfffa4b2..64309fc8a6e6414d66180bf8435d0edc4d39f06a 100644 (file)
--- a/contrib/src/animate/animate.cpp
+++ b/contrib/src/animate/animate.cpp
@@ -270,7 +270,11 @@ bool wxAnimationPlayer::PlayFrame()
     PlayFrame(GetCurrentFrame(), * GetWindow(), GetPosition());
 
     // Set the timer for the next frame
-    m_timer.Start(GetDelay(GetCurrentFrame()));
+    int delay = GetDelay(GetCurrentFrame());
+    if (delay == 0)
+        delay = 1;      // 0 is invalid timeout for wxTimer.
+    
+    m_timer.Start(delay);
 
     m_currentFrame ++;
 
@@ -572,6 +576,8 @@ bool wxAnimationCtrlBase::Create(wxWindow *parent, wxWindowID id,
     m_animationPlayer.SetPosition(wxPoint(0, 0));
     m_animationPlayer.SetDestroyAnimation(FALSE);
 
+    LoadFile(filename);
+    
     return TRUE;
 }