Merge pull request #4303 from Jojo-Schmitz/file_settings

fix #278712: mscore/file.cpp and QSettings variables
This commit is contained in:
Dmitri Ovodok 2020-03-11 15:19:36 +02:00 committed by GitHub
commit 14de329db2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1703,8 +1703,10 @@ void MuseScore::exportFile()
if (saveDirectory.isEmpty())
saveDirectory = preferences.getString(PREF_APP_PATHS_MYSCORES);
if (lastSaveCopyFormat.isEmpty())
lastSaveCopyFormat = settings.value("lastSaveCopyFormat", "pdf").toString();
if (lastSaveCopyFormat.isEmpty()) {
QSettings set;
lastSaveCopyFormat = set.value("lastSaveCopyFormat", "pdf").toString();
}
QString saveFormat = lastSaveCopyFormat;
if (saveFormat.isEmpty())
@ -1783,8 +1785,10 @@ bool MuseScore::exportParts()
if (saveDirectory.isEmpty())
saveDirectory = preferences.getString(PREF_APP_PATHS_MYSCORES);
if (lastSaveCopyFormat.isEmpty())
lastSaveCopyFormat = settings.value("lastSaveCopyFormat", "pdf").toString();
if (lastSaveCopyFormat.isEmpty()) {
QSettings set;
lastSaveCopyFormat = set.value("lastSaveCopyFormat", "pdf").toString();
}
QString saveFormat = lastSaveCopyFormat;
if (saveFormat.isEmpty())