fixed the miscellaneous bugs; time for a pull request!

This commit is contained in:
Ethan Warth 2015-08-10 02:43:45 -05:00
parent a7a83b3953
commit a85f2e3076
1 changed files with 5 additions and 4 deletions

View File

@ -1277,7 +1277,11 @@ void MainWindow::PlaylistDoubleClick(const QModelIndex& index) {
switch (doubleclick_playlist_playmode_) {
case PlaylistPlayBehaviour_Always:
case PlaylistPlayBehaviour_IfStopped:
app_->player()->PlayPause();
if (app_->player()->GetState() != Engine::Playing) {
app_->player()->PlayAt(
app_->playlist_manager()->current()->queue()->TakeNext(),
Engine::Manual, true);
}
break;
case PlaylistPlayBehaviour_Never:
// deliberately do nothing here
@ -1290,9 +1294,6 @@ void MainWindow::PlaylistDoubleClick(const QModelIndex& index) {
break;
}
app_->playlist_manager()->SetActiveToCurrent();
app_->player()->PlayAt(row, Engine::Manual, true);
}
void MainWindow::VolumeWheelEvent(int delta) {