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

Sigint and whatnot revert #78791

Open
wants to merge 6 commits into
base: master
Choose a base branch
from

Conversation

ZhilkinSerg
Copy link
Contributor

Summary

None

Purpose of change

Resolve issues described in #77636 (comment)

Describe the solution

Revert #67893
Revert #68071
Revert #75999
Revert #77457
Revert #77651
Revert #78379

Testing

Make sure Alt+F4 works as before cdda-experimental-2024-10-21-1656 - i.e., Alt+F4 quits immediately and not after ui is changed.

Additional context

This would probably again bring up some bugs (previously resolved by reverted PRs), so we might still want to resolve them with a different approach (and/or more carefully testing that Alt+F4 still properly works).

@github-actions github-actions bot added Info / User Interface Game - player communication, menus, etc. [C++] Changes (can be) made in C++. Previously named `Code` astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Dec 27, 2024
@ZhilkinSerg
Copy link
Contributor Author

Revert diffs (for git apply -R /c/Projects/Cataclysm-DDA-patches/revert/67893.diff command):

revert_diffs.zip

@RenechCDDA
Copy link
Member

Would re-open #8417 at the very least.

Assuming this is the approach we're going with, do we really need to revert #67893 and #68071?

We're going to want to resolve the signal handler issues regardless(I think??), so I would think we at least want to keep those two?

Basically, I'm not sold on the purpose of this change. This is just trading a different kind of broken IMO

@harakka
Copy link
Member

harakka commented Dec 27, 2024

Assuming this is the approach we're going with, do we really need to revert #67893 and #68071?

#68071 can be ignored from this discussion, object creator is basically dead code that is kept in repo as courtesy.

@ZhilkinSerg
Copy link
Contributor Author

ZhilkinSerg commented Dec 27, 2024

Assuming this is the approach we're going with, do we really need to revert #67893 and #68071?

We are just returning back to status quo before all the issues appeared. I am not against applying these patches again - just with proper testing they don't break anything again (I just can't test them myself right now as these are non-Windows changes and I don't have Linux VM at the moment).

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Dec 27, 2024
@andrei8l
Copy link
Contributor

Would re-open #8417 at the very least.

I don't think so. That issue was pointless pedantry. If you're SIGINT'ing, 99% of the time it's because you really do want to quit and we were cleaning up the UI state to some degree in any case.

Assuming this is the approach we're going with, do we really need to revert #67893 and #68071?

Yes! They introduced a lot of other issues that my PRs tried to solve.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions [C++] Changes (can be) made in C++. Previously named `Code` Info / User Interface Game - player communication, menus, etc. json-styled JSON lint passed, label assigned by github actions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants