Skip to content

Commit

Permalink
Don't restrict -f option to converter mode
Browse files Browse the repository at this point in the history
  • Loading branch information
Jojo-Schmitz committed Sep 23, 2024
1 parent 9b1746a commit 2ed7969
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion mscore/file.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ static bool readScoreError(const QString& name, Score::FileError error, bool ask
msg += MScore::lastError;
break;
}
if (converterMode && canIgnore && ignoreWarnings) {
if (canIgnore && ignoreWarnings) {
fprintf(stderr, "%s\n\nWarning ignored, forcing score to load\n", qPrintable(msg));
return true;
}
Expand Down
4 changes: 1 addition & 3 deletions mscore/plugin/api/qmlpluginapi.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,9 @@ bool PluginAPI::writeScore(Score* s, const QString& name, const QString& ext)

Score* PluginAPI::readScore(const QString& name, bool noninteractive)
{
bool oldConvertermode = converterMode;
bool oldIgnoreWarnings = ignoreWarnings;
converterMode = ignoreWarnings = !noninteractive;
ignoreWarnings = !noninteractive;
Ms::Score* score = msc()->openScore(name, !noninteractive);
converterMode = oldConvertermode;
ignoreWarnings = oldIgnoreWarnings;
if (score) {
if (noninteractive)
Expand Down

0 comments on commit 2ed7969

Please sign in to comment.