1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QStorageInfo/Linux: move retrieveVolumeInfo() up because it won't fail

Browse Source 
initRootPath() may fail, so let's make sure we do extract some
information from the FS even if that does. Issue introduced by
3e330a79ec8d273630660eefae42995018421c0c ("QStorageInfo/Linux: rewrite
the label retriever to use device IDs")

Task-number: QTBUG-121140
Change-Id: I76ffba14ece04f24b43efffd17ab2df71af8c4e0
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
(cherry picked from commit 264b7a67330fb1a3fd0f896603e75ada46326875)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Thiago Macieira 2024-01-17 08:03:43 -08:00 committed by Qt Cherry-pick Bot
parent b375dac923
commit d688eab7da
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/io/qstorageinfo_linux.cpp
View File

@ -136,11 +136,11 @@ static inline QString retrieveLabel(const QByteArray &device, quint64 deviceId)
void QStorageInfoPrivate::doStat() void QStorageInfoPrivate::doStat()
{ {
retrieveVolumeInfo();
quint64 deviceId = initRootPath(); quint64 deviceId = initRootPath();
if (!deviceId) if (!deviceId)
return; return;
retrieveVolumeInfo();
name = retrieveLabel(device, deviceId); name = retrieveLabel(device, deviceId);
} }