Skip to content

Commit 56c55a7

Browse files
Fix: Revert to .reset() because make_unique is incompatible with custom deleter
1 parent f1972ee commit 56c55a7

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

src/app/linuxdrivemanager.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ bool LinuxDrive::write(ReleaseVariant *data)
202202
if (m_image->status() == ReleaseVariant::READY || m_image->status() == ReleaseVariant::FAILED || m_image->status() == ReleaseVariant::FAILED_VERIFICATION || m_image->status() == ReleaseVariant::FINISHED)
203203
m_image->setStatus(ReleaseVariant::WRITING);
204204

205-
m_process = std::make_unique<QProcess>(this);
205+
m_process.reset(new QProcess(this));
206206

207207
QStringList args;
208208
if (QFile::exists(qApp->applicationDirPath() + "/../helper/linux/helper")) {
@@ -240,7 +240,7 @@ void LinuxDrive::restore()
240240
{
241241
mDebug() << this->metaObject()->className() << "Will now restore" << this->m_device;
242242

243-
m_process = std::make_unique<QProcess>(this);
243+
m_process.reset(new QProcess(this));
244244

245245
m_restoreStatus = RESTORING;
246246
emit restoreStatusChanged();

src/app/macdrivemanager.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ bool MacDrive::write(ReleaseVariant *data)
8787
if (m_image->status() == ReleaseVariant::READY || m_image->status() == ReleaseVariant::FAILED || m_image->status() == ReleaseVariant::FAILED_VERIFICATION || m_image->status() == ReleaseVariant::FINISHED)
8888
m_image->setStatus(ReleaseVariant::WRITING);
8989

90-
m_process = std::make_unique<QProcess>(this);
90+
m_process.reset(new QProcess(this));
9191
connect(m_process.get(), static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), this, &MacDrive::onFinished);
9292
connect(m_process.get(), &QProcess::readyRead, this, &MacDrive::onReadyRead);
9393
connect(qApp, &QCoreApplication::aboutToQuit, m_process.get(), &QProcess::terminate);
@@ -122,7 +122,7 @@ void MacDrive::restore()
122122
{
123123
mCritical() << "starting to restore";
124124

125-
m_process = std::make_unique<QProcess>(this);
125+
m_process.reset(new QProcess(this));
126126

127127
m_restoreStatus = RESTORING;
128128
emit restoreStatusChanged();

src/app/windrivemanager.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ bool WinDrive::write(ReleaseVariant *data)
122122
if (!Drive::write(data))
123123
return false;
124124

125-
m_process = std::make_unique<QProcess>(this);
125+
m_process.reset(new QProcess(this));
126126
connect(m_process.get(), static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), this, &WinDrive::onFinished);
127127
connect(m_process.get(), &QProcess::readyRead, this, &WinDrive::onReadyRead);
128128
connect(qApp, &QCoreApplication::aboutToQuit, m_process.get(), &QProcess::terminate);
@@ -158,7 +158,7 @@ void WinDrive::restore()
158158
{
159159
mDebug() << this->metaObject()->className() << "Preparing to restore disk" << m_device;
160160

161-
m_process = std::make_unique<QProcess>(this);
161+
m_process.reset(new QProcess(this));
162162

163163
m_restoreStatus = RESTORING;
164164
emit restoreStatusChanged();

0 commit comments

Comments
 (0)