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

Allow to break directory scan started from a macro (Mantis#0002692). #706

Merged
merged 1 commit into from Jun 17, 2023

Conversation

johnd0e
Copy link
Contributor

@johnd0e johnd0e commented Jun 15, 2023

Fix by Shmuel: shmuz/far2m#36

@johnd0e
Copy link
Contributor Author

johnd0e commented Jun 15, 2023

@shmuz

far/dirinfo.cpp Outdated Show resolved Hide resolved
@johnd0e johnd0e marked this pull request as draft June 16, 2023 09:05
@johnd0e
Copy link
Contributor Author

johnd0e commented Jun 16, 2023

@alabuzhev
But what is wrong with nmake_clang_x64_* builds?

@alabuzhev
Copy link
Contributor

But what is wrong with nmake_clang_x64_* builds?

Looks like they updated VS in the build image and something is no longer compatible.
Don't worry about it, it's not related to your changes in any way.

@johnd0e johnd0e marked this pull request as ready for review June 17, 2023 09:23
far/dirinfo.cpp Outdated Show resolved Hide resolved
far/dirinfo.cpp Outdated Show resolved Hide resolved
while (ScTree.GetNextName(FindData,strFullName))
{
// Mantis#0002692
if (!Global->CtrlObject->Macro.IsExecuting())
Copy link
Contributor

Choose a reason for hiding this comment

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

As far as I understand, this has been already attempted in f7ae5b2 and reverted in 2f8d7e7 due to issues, discussed in M#2692.
Are we positive that suppressing macros fixes those issues?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You can test it yourself.

  1. Place cursor at some pretty large directory
  2. Execute lua:Keys"EnOut F3 F1"
  3. Wait a couple of seconds, then press `Esc´
    Note 2 things:
    • Operation is successfully interrupted
    • Help screen appears only after operation is finished (or interrupted), and not immediately, like was in f7ae5b2

@johnd0e johnd0e force-pushed the fix-macro-f3-ctrlq branch 2 times, most recently from 0c189c9 to 7050380 Compare June 17, 2023 13:56
@alabuzhev alabuzhev merged commit 839a993 into FarGroup:master Jun 17, 2023
23 of 26 checks passed
@alabuzhev
Copy link
Contributor

Thank you

@johnd0e johnd0e deleted the fix-macro-f3-ctrlq branch June 17, 2023 20:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants