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

PR: Fix segfault when closing files removed outside Spyder (Editor) #20586

Merged
merged 3 commits into from
Feb 24, 2023

Conversation

ccordoba12
Copy link
Member

@ccordoba12 ccordoba12 commented Feb 24, 2023

Description of Changes

  • This happened when you opened two or more files that exist in a branch (e.g. spyder/plugins/debugger/api.py and spyder/plugins/debugger/plugin.py in master) one after the other, then switch to a branch where they are not available (e.g. 5.x) and go back to Spyder.

    The crash happened after Spyder tried to close the second file, when you answer Yes in the dialog below (you had to also answer Yes for the first removed file):

    image

  • Improve a couple of translation strings.

  • Ignore some revisions that changed line endings of spyder/plugins/editor/widgets/editor.py and spyder/plugins/editor/widgets/codeeditor.py because they broke git blame of those files.

Issue(s) Resolved

Fixes #18838.

Affirmation

By submitting this Pull Request or typing my (user)name below,
I affirm the Developer Certificate of Origin
with respect to all commits and content included in this PR,
and understand I am releasing the same under Spyder's MIT (Expat) license.

I certify the above statement is true and correct:

Copy link
Member

@dalthviz dalthviz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @ccordoba12 ! Checked locally on Windows and seems like is working 👍

@dalthviz dalthviz merged commit 854a9b9 into spyder-ide:5.x Feb 24, 2023
dalthviz added a commit that referenced this pull request Feb 24, 2023
@ccordoba12 ccordoba12 deleted the issue-18838 branch February 24, 2023 23:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants