Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix "Resolve conflicts" dialog not showing up #7789

Merged
merged 1 commit into from
Jan 24, 2025
+2 −2
Merged

fix "Resolve conflicts" dialog not showing up #7789

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/gui/systray.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*

Check notice on line 1 in src/gui/systray.cpp

View workflow job for this annotation

GitHub Actions / build

Run clang-format on src/gui/systray.cpp 

File src/gui/systray.cpp does not conform to Custom style guidelines. (lines 310)
* Copyright (C) by Cédric Bellegarde <gnumdk@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
Expand Down Expand Up @@ -301,13 +301,13 @@

// This call dialog gets deallocated on close conditions
// by a call from the QML side to the destroyDialog slot
auto dialog = QScopedPointer(conflictsDialog->createWithInitialProperties(initialProperties));
auto dialog = std::unique_ptr<QObject>(conflictsDialog->createWithInitialProperties(initialProperties));
if (!dialog) {
return;
}
dialog->setParent(QGuiApplication::instance());

auto dialogWindow = qobject_cast<QQuickWindow*>(dialog.data());
auto dialogWindow = qobject_cast<QQuickWindow*>(dialog.release());
if (!dialogWindow) {
return;
}
Expand Down
Loading