Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #4955 from eduardosm/esm-branch1

Browse Source 
Fix "menu_previousmode" setting not loading when opening the settings window
This commit is contained in:
John Maguire 2015-07-15 17:58:45 +01:00
commit 85858d7bbe
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ext/clementine-tagreader/main.cpp
View File

@ -57,8 +57,8 @@ int main(int argc, char** argv) {
QSslSocket::addDefaultCaCertificates(
QSslCertificate::fromPath(":/certs/godaddy-root.pem", QSsl::Pem));
QSslSocket::addDefaultCaCertificates(
QSslCertificate::fromPath(":/certs/Equifax_Secure_Certificate_Authority.pem", QSsl::Pem));
QSslSocket::addDefaultCaCertificates(QSslCertificate::fromPath(
":/certs/Equifax_Secure_Certificate_Authority.pem", QSsl::Pem));
TagReaderWorker worker(&socket);

1
src/core/player.cpp
View File

@ -109,7 +109,6 @@ void Player::ReloadSettings() {
s.endGroup();
engine_->ReloadSettings();
}

2
src/ui/behavioursettingspage.cpp
View File

@ -130,6 +130,8 @@ void BehaviourSettingsPage::Load() {
s.endGroup();
s.beginGroup(Player::kSettingsGroup);
ui_->menu_previousmode->setCurrentIndex(ui_->menu_previousmode->findData(
s.value("menu_previousmode", Player::PreviousBehaviour_DontRestart).toInt()));
ui_->seek_step_sec->setValue(s.value("seek_step_sec", 10).toInt());
s.endGroup();