Index: libs/libmythtv/NuppelVideoPlayer.cpp
===================================================================
--- libs/libmythtv/NuppelVideoPlayer.cpp	(revision 11141)
+++ libs/libmythtv/NuppelVideoPlayer.cpp	(working copy)
@@ -453,7 +453,7 @@
 
     if (wait && !video_actually_paused)
     {
-        while (!videoThreadPaused.wait(1000))
+        while (pausevideo && !videoThreadPaused.wait(1000))
         {
             if (eof)
                 return;
@@ -3299,11 +3299,15 @@
             {
                 PauseVideo();
 
-                DoRewind();
+	        if (GetVideoPause())
+		{
+                    DoRewind();
 
-                UnpauseVideo();
-                while (GetVideoPause())
-                    usleep(1000);
+                    UnpauseVideo();
+                    while (GetVideoPause())
+                       usleep(1000);
+        	}
+       
             }
             rewindtime = 0;
         }
@@ -3315,16 +3319,18 @@
             if (fftime >= 5)
             {
                 PauseVideo();
-
-                if (fftime >= 5)
+	       
+	        if (GetVideoPause())
+        	{
                     DoFastForward();
 
-                if (eof)
-                    continue;
+                    if (eof)
+                        continue;
 
-                UnpauseVideo();
-                while (GetVideoPause())
-                    usleep(1000);
+                    UnpauseVideo();
+                    while (GetVideoPause())
+                        usleep(1000);
+		}
             }
 
             fftime = 0;