mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-21 20:45:51 +03:00
Code Issues Projects Releases Packages Wiki Activity

improve reliability of memeory management when creating conflicts dialog

Browse source 
use more automatyed memory management to reduce possible errors

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
This commit is contained in:
Matthieu Gallien 2023-05-16 11:30:45 +02:00 committed by Matthieu Gallien
parent 5349395063
commit 14bce6fdc2
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/gui/systray.cpp
View file

@ -287,38 +287,32 @@ void Systray::destroyEditFileLocallyLoadingDialog()
void Systray::createResolveConflictsDialog(const OCC::ActivityList &allConflicts)
{
const auto conflictsDialog = new QQmlComponent(_trayEngine, QStringLiteral("qrc:/qml/src/gui/ResolveConflictsDialog.qml"));
const auto conflictsDialog = std::make_unique<QQmlComponent>(_trayEngine, QStringLiteral("qrc:/qml/src/gui/ResolveConflictsDialog.qml"));
const QVariantMap initialProperties{
{"allConflicts", QVariant::fromValue(allConflicts)},
};
if(conflictsDialog->isError()) {
qCWarning(lcSystray) << conflictsDialog->errorString();
delete conflictsDialog;
return;
}
// This call dialog gets deallocated on close conditions
// by a call from the QML side to the destroyDialog slot
auto dialog = conflictsDialog->createWithInitialProperties(initialProperties);
auto dialog = QScopedPointer(conflictsDialog->createWithInitialProperties(initialProperties));
if (!dialog) {
delete dialog;
delete conflictsDialog;
return;
}
dialog->setParent(QGuiApplication::instance());
auto dialogWindow = qobject_cast<QQuickWindow*>(dialog);
auto dialogWindow = qobject_cast<QQuickWindow*>(dialog.data());
if (!dialogWindow) {
delete dialog;
delete conflictsDialog;
return;
}
dialogWindow->show();
dialogWindow->raise();
dialogWindow->requestActivate();
delete conflictsDialog;
dialog.take();
}
bool Systray::raiseDialogs()