diff options
| author | Luca Beltrame <[email protected]> | 2013-03-27 16:50:22 +0100 |
|---|---|---|
| committer | Luca Beltrame <[email protected]> | 2013-03-27 16:50:22 +0100 |
| commit | 8cc479518be479365d91e5139f064fcce970d0a3 (patch) | |
| tree | 5b7fbc8843a2eddbefc61d0cfee075617cf0ba4b /src/kitemviews/kfileitemmodelrolesupdater.cpp | |
| parent | 6dfcd7afd9336ee73d78f703e208088aa3f5ca60 (diff) | |
| parent | df8d439c55ea62eeb109bf5ff8f55ae3f386dd70 (diff) | |
Merge remote-tracking branch 'origin/KDE/4.10'
Conflicts:
plasma/applets/folderview/folderview.cpp
Diffstat (limited to 'src/kitemviews/kfileitemmodelrolesupdater.cpp')
| -rw-r--r-- | src/kitemviews/kfileitemmodelrolesupdater.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/kitemviews/kfileitemmodelrolesupdater.cpp b/src/kitemviews/kfileitemmodelrolesupdater.cpp index a6d2e9a7f..9fca8a1f6 100644 --- a/src/kitemviews/kfileitemmodelrolesupdater.cpp +++ b/src/kitemviews/kfileitemmodelrolesupdater.cpp @@ -996,7 +996,7 @@ bool KFileItemModelRolesUpdater::applyResolvedRoles(const KFileItem& item, Resol const bool resolveAll = (hint == ResolveAll); bool mimeTypeChanged = false; - if (!item.isMimeTypeKnown()) { + if (!item.isMimeTypeKnown() || !item.isFinalIconKnown()) { item.determineMimeType(); mimeTypeChanged = true; } |