From 21cc1202f33e850c23bb58e4222ab5836044407a Mon Sep 17 00:00:00 2001 From: Rene Gollent Date: Tue, 26 Aug 2008 02:32:13 +0000 Subject: [PATCH] Fix this bug in the correct spot by forbidding the controller from trying to toggle the playback state if it hasn't been initialized with a file. Thanks for the tip, Stephan! git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27205 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/mediaplayer/Controller.cpp | 3 ++- .../mediaplayer/media_node_framework/PlaybackManager.cpp | 5 +---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/apps/mediaplayer/Controller.cpp b/src/apps/mediaplayer/Controller.cpp index 0eb302b2f5..2a67715e11 100644 --- a/src/apps/mediaplayer/Controller.cpp +++ b/src/apps/mediaplayer/Controller.cpp @@ -480,7 +480,8 @@ Controller::TogglePlaying() BAutolock _(this); - NodeManager::TogglePlaying(); + if (InitCheck() == B_OK) + NodeManager::TogglePlaying(); } diff --git a/src/apps/mediaplayer/media_node_framework/PlaybackManager.cpp b/src/apps/mediaplayer/media_node_framework/PlaybackManager.cpp index 5ac2bc5f61..e085453302 100644 --- a/src/apps/mediaplayer/media_node_framework/PlaybackManager.cpp +++ b/src/apps/mediaplayer/media_node_framework/PlaybackManager.cpp @@ -371,11 +371,8 @@ PlaybackManager::SetCurrentFrame(int64 frame) void PlaybackManager::SetPlayMode(int32 mode, bool continuePlaying) { - PlayingState* lastState = _LastState(); - if (lastState == NULL) - return; //printf("PlaybackManager::SetPlayMode(%ld, %d)\n", mode, continuePlaying); - PlayingState* newState = new PlayingState(*lastState); + PlayingState* newState = new PlayingState(*_LastState()); newState->play_mode = mode; // Jump to the playing start frame if we should not continue, where we // stop.