From 2ed7969914b3e16170b3cac64f5689f2949070e4 Mon Sep 17 00:00:00 2001 From: Joachim Schmitz Date: Sun, 22 Sep 2024 19:02:53 +0200 Subject: [PATCH] Don't restrict -f option to converter mode --- mscore/file.cpp | 2 +- mscore/plugin/api/qmlpluginapi.cpp | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/mscore/file.cpp b/mscore/file.cpp index 8009b323cc4aa..b780fd9e5f1c1 100644 --- a/mscore/file.cpp +++ b/mscore/file.cpp @@ -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; } diff --git a/mscore/plugin/api/qmlpluginapi.cpp b/mscore/plugin/api/qmlpluginapi.cpp index e0d4297c2c025..2a6aad8ded87d 100644 --- a/mscore/plugin/api/qmlpluginapi.cpp +++ b/mscore/plugin/api/qmlpluginapi.cpp @@ -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)