office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-08-27 11:40:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fine tune opening files

Browse source 
If we're going to set triedMimeFromFileContent to true we need to
actually try the contents and not the extension.

This is a KF5 porting mistake
This commit is contained in:
Albert Astals Cid 2018-10-02 00:33:58 +02:00
parent ccb19c681d
commit caf52d0ed9
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/document.cpp
View file

@ -2416,7 +2416,7 @@ Document::OpenResult Document::openDocument(const QString & docFile, const QUrl
KPluginMetaData offer = DocumentPrivate::generatorForMimeType(mime, d->m_widget);
if ( !offer.isValid() && !triedMimeFromFileContent )
{
QMimeType newmime = db.mimeTypeForFile(docFile, QMimeDatabase::MatchExtension);
QMimeType newmime = db.mimeTypeForFile(docFile, QMimeDatabase::MatchContent);
triedMimeFromFileContent = true;
if ( newmime != mime )
{
@ -2466,7 +2466,7 @@ Document::OpenResult Document::openDocument(const QString & docFile, const QUrl
if (openResult == OpenError && !triedMimeFromFileContent )
{
QMimeType newmime = db.mimeTypeForFile(docFile, QMimeDatabase::MatchExtension);
QMimeType newmime = db.mimeTypeForFile(docFile, QMimeDatabase::MatchContent);
triedMimeFromFileContent = true;
if ( newmime != mime )
{