iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix build when -DENABLE_SIMPLE_MPD_SUPPORT=OFF

Browse Source 
#677
This commit is contained in:
Craig Drummond
2015-07-04 17:53:35 +01:00
committed by Craig Drummond
parent 26294b5fa5
commit ff69ceb371
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gui/initialsettingswizard.cpp
View File

@@ -229,11 +229,10 @@ void InitialSettingsWizard::accept()
Settings::self()->saveCurrentConnection(MPDUser::constName);
Settings::self()->saveStopOnExit(true);
emit setDetails(MPDUser::self()->details());
} else
#endif
{
} else {
MPDUser::self()->cleanup();
}
#endif
Settings::self()->save();
QDialog::accept();
}

7
gui/serversettings.cpp
View File

@@ -112,7 +112,9 @@ ServerSettings::ServerSettings(QWidget *p)
coverNameLabel->setToolTip(coverName->toolTip());
coverName->setValidator(new CoverNameValidator(this));
basicCoverName->setValidator(new CoverNameValidator(this));
#ifdef ENABLE_SIMPLE_MPD_SUPPORT
name->setValidator(new CollectionNameValidator(this));
#endif
#ifndef ENABLE_HTTP_STREAM_PLAYBACK
REMOVE(streamUrlLabel)
REMOVE(streamUrl)
@@ -239,7 +241,10 @@ void ServerSettings::showDetails(int index)
details.name=generateName(prevIndex);
}
collections.replace(prevIndex, details);
if (details.name!=MPDUser::constName) {
#ifdef ENABLE_SIMPLE_MPD_SUPPORT
if (details.name!=MPDUser::constName)
#endif
{
combo->setItemText(prevIndex, details.name);
}
}