napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[partition] Fix logic errors in stringification of MessageAndPath

Browse Source
This commit is contained in:
Adriaan de Groot 2021-11-02 00:09:52 +01:00
parent c322eaa430
commit f49389a408
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/modules/partition/jobs/ClearMountsJob.cpp
View File

@ -125,13 +125,14 @@ public:
{ {
} }
bool isEmpty() const { return m_message; } bool isEmpty() const { return !m_message; }
explicit operator QString() const explicit operator QString() const
{ {
return isEmpty() ? QString() : QCoreApplication::translate( "ClearMountsJob", m_message ); return isEmpty() ? QString() : QCoreApplication::translate( "ClearMountsJob", m_message ).arg( m_path );
} }
private:
const char* const m_message = nullptr; const char* const m_message = nullptr;
QString const m_path; QString const m_path;
}; };
@ -143,7 +144,7 @@ operator<<( QDebug& s, const MessageAndPath& m )
{ {
return s; return s;
} }
return s << QString( m.m_message ).arg( m.m_path ); return s << QString( m );
} }