Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
mirror of https://github.com/clementine-player/Clementine synced 2025-01-07 07:41:54 +01:00
Code Issues Releases Wiki Activity

Merge pull request #4880 from Chocobozzz/master

Browse Source 
Fix save state when the song was paused
This commit is contained in:
John Maguire 2015-06-02 18:14:27 +01:00
commit 4b332b8137
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/ui/mainwindow.cpp
View File

@ -422,7 +422,8 @@ MainWindow::MainWindow(Application* app, SystemTrayIcon* tray_icon, OSD* osd,
// Playlist view actions // Playlist view actions
ui_->action_next_playlist->setShortcuts( ui_->action_next_playlist->setShortcuts(
QList<QKeySequence>() << QKeySequence::fromString("Ctrl+Tab") QList<QKeySequence>()
<< QKeySequence::fromString("Ctrl+Tab")
#ifdef Q_OS_DARWIN #ifdef Q_OS_DARWIN
// On OS X "Ctrl+Tab" == Cmd + Tab but this shorcut // On OS X "Ctrl+Tab" == Cmd + Tab but this shorcut
// is already used by default for switching between // is already used by default for switching between
@ -1190,13 +1191,15 @@ void MainWindow::LoadPlaybackStatus() {
void MainWindow::ResumePlayback() { void MainWindow::ResumePlayback() {
qLog(Debug) << "Resuming playback"; qLog(Debug) << "Resuming playback";
if (saved_playback_state_ == Engine::Paused) {
NewClosure(app_->player(), SIGNAL(Playing()), app_->player(),
SLOT(PlayPause()));
}
app_->player()->Play(); app_->player()->Play();
app_->player()->SeekTo(saved_playback_position_); app_->player()->SeekTo(saved_playback_position_);
if (saved_playback_state_ == Engine::Paused) {
app_->player()->Pause();
}
} }
void MainWindow::PlayIndex(const QModelIndex& index) { void MainWindow::PlayIndex(const QModelIndex& index) {