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.

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

Cleanup all browser layer properties dialog before exiting #54808

Merged
merged 1 commit into from Oct 3, 2023

Conversation

nyalldawson
Copy link
Collaborator

These must be deleted before calling QgsApplication::exitQgis, or we get a crash

Fixes #39094

Description

[Replace this with some text explaining the rationale and details about this pull request]

These must be deleted before calling QgsApplication::exitQgis,
or we get a crash

Fixes qgis#39094
@github-actions github-actions bot added this to the 3.34.0 milestone Oct 3, 2023
@3nids 3nids merged commit d2ee3eb into qgis:master Oct 3, 2023
34 checks passed
@qgis-bot
Copy link
Collaborator

qgis-bot commented Oct 3, 2023

The backport to queued_ltr_backports failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 60f04e93df... Cleanup all browser layer properties dialog before exiting
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

stdout
Auto-merging src/app/qgisapp.cpp
CONFLICT (content): Merge conflict in src/app/qgisapp.cpp

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-queued_ltr_backports queued_ltr_backports
# Navigate to the new working tree
cd .worktrees/backport-queued_ltr_backports
# Create a new branch
git switch --create backport-54808-to-queued_ltr_backports
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 60f04e93df628dc950f19ec2d7091bae1d6d4178
# Push it to GitHub
git push --set-upstream origin backport-54808-to-queued_ltr_backports
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-queued_ltr_backports

Then, create a pull request where the base branch is queued_ltr_backports and the compare/head branch is backport-54808-to-queued_ltr_backports.

@qgis-bot qgis-bot added the failed backport The automated backport attempt failed, needs a manual backport label Oct 3, 2023
nyalldawson added a commit to nyalldawson/QGIS that referenced this pull request Oct 3, 2023
These must be deleted before calling QgsApplication::exitQgis,
or we get a crash

Fixes qgis#39094

(cherry picked from commit d2ee3eb)
nyalldawson added a commit that referenced this pull request Oct 6, 2023
These must be deleted before calling QgsApplication::exitQgis,
or we get a crash

Fixes #39094

(cherry picked from commit d2ee3eb)
nyalldawson added a commit that referenced this pull request Oct 27, 2023
These must be deleted before calling QgsApplication::exitQgis,
or we get a crash

Fixes #39094

(cherry picked from commit d2ee3eb)
nyalldawson added a commit that referenced this pull request Oct 28, 2023
These must be deleted before calling QgsApplication::exitQgis,
or we get a crash

Fixes #39094

(cherry picked from commit d2ee3eb)
@nyalldawson nyalldawson deleted the fix_39094 branch December 3, 2023 22:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport queued_ltr_backports Queued Backports failed backport The automated backport attempt failed, needs a manual backport
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Layer Properties pop up (unusable) behind the DataSource Manager/Browser dialog
3 participants