Merge branch 'jb36851' into 'master'

[nemo-storage] Accept a partition even if it's not mountable or encrypted. Fixes JB#36851 See merge request mer-core/nemo-qml-plugin-systemsettings!97
sailfishos · Feb 15, 2019 · f4375b5 · f4375b5
2 parents cf036f2 + c3ebca3
commit f4375b5
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/udisks2blockdevices.cpp b/src/udisks2blockdevices.cpp
@@ -284,7 +284,7 @@ void BlockDevices::complete(Block *block, bool forceAccept)
         });
     }
 
-    bool willAccept = !unlocked && (block->isMountable() || block->isEncrypted() || block->isFormatting() || forceAccept);
+    bool willAccept = !unlocked && (block->isPartition() || block->isMountable() || block->isEncrypted() || block->isFormatting() || forceAccept);
     qCInfo(lcMemoryCardLog) << "Completed block" << qPrintable(block->path())
                             << "is" << (willAccept ? "accepted" : "rejected");
     block->dumpInfo();