Merge remote-tracking branch 'origin/release/20.12'

5 years ago · 9d0800a57a
parent 4c7a2ac60e 9e23338b00
commit 9d0800a57a
1 changed files with 4 additions and 2 deletions
--- a/part/part.cpp
+++ b/part/part.cpp
@ -1468,8 +1468,10 @@ bool Part::openFile()
        }

        if (mimes[0].inherits(QStringLiteral("text/plain"))) {
-            QMimeType contentMime = db.mimeTypeForFile(fileNameToOpen, QMimeDatabase::MatchContent);
-            mimes.prepend(contentMime);
+            const QMimeType contentMime = db.mimeTypeForFile(fileNameToOpen, QMimeDatabase::MatchContent);
+            if (contentMime.name() != QLatin1String("text/plain")) {
+                mimes.prepend(contentMime);
+            }
        }
    } else {
        mimes << pathMime;