Martchus
/
tageditor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

never keep previous lyrics

This commit is contained in:
Martchus 2016-03-05 17:03:17 +01:00
parent 7315302a88
commit 283c1f1f71
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gui/tageditorwidget.cpp
View File

@ -735,7 +735,7 @@ void TagEditorWidget::showFile(char result)
// load existing tags
m_tags.clear();
m_fileInfo.tags(m_tags);
// show notification if there is currently no existing tag(s) could be found
// show notification if no existing tag(s) could be found
if(!m_tags.size()) {
m_ui->parsingNotificationWidget->appendLine(tr("There is no (supported) tag assigned."));
if(!m_fileInfo.areTagsSupported()) {
@ -752,10 +752,10 @@ void TagEditorWidget::showFile(char result)
Settings::keepVersionOfExistingId3v2Tag(), Settings::id3v2versionToBeUsed());
}
}
// tags might have been adjusted -> reload tags
m_tags.clear();
m_fileInfo.tags(m_tags);
}
// reload tags
m_tags.clear();
m_fileInfo.tags(m_tags);
// update file watcher
m_fileWatcher->addPath(m_currentPath);
m_fileChangedOnDisk = false;

6
gui/tagfieldedit.cpp
View File

@ -704,7 +704,7 @@ void TagFieldEdit::updateValue(const TagValue &value, PreviousValueHandling prev
QString text;
try {
text = Utility::tagValueToQString(value);
} catch (ConversionException &) {
} catch (const ConversionException &) {
conversionError = true;
}
applyAutoCorrection(text);
@ -770,7 +770,7 @@ void TagFieldEdit::updateValue(const TagValue &value, PreviousValueHandling prev
QString desc = Utility::stringToQString(value.description(), value.descriptionEncoding());
applyAutoCorrection(desc);
m_descriptionLineEdit->setText(desc);
} catch(ConversionException &) {
} catch(const ConversionException &) {
conversionError = true;
m_descriptionLineEdit->clear();
}
@ -864,7 +864,9 @@ void TagFieldEdit::concretizePreviousValueHandling(PreviousValueHandling &previo
switch(previousValueHandling) {
case PreviousValueHandling::Auto:
switch(m_field) {
// these differ for each song -> always clear previous value
case KnownField::Title:
case KnownField::Lyrics:
previousValueHandling = PreviousValueHandling::Clear;
break;
// these will be incremented