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

Various lost in limbo fixes #2293

Merged
merged 6 commits into from Dec 9, 2016
Merged

Various lost in limbo fixes #2293

merged 6 commits into from Dec 9, 2016

Conversation

tiennou
Copy link
Member

@tiennou tiennou commented Nov 30, 2016

No description provided.

@skurfer
Copy link
Member

@skurfer skurfer commented Nov 30, 2016

The conflict panel is still getting called on the main thread in -[FSActions renameFile:withName:]. 😃

Why not force it to the main thread in QSFileConflictPanel itself so the one calling it doesn’t have to remember?

skurfer added 3 commits Dec 8, 2016
conflict names is populated with destinationFile a few lines earlier, so they will always be equal and the rename code would never run
otherwise, the rename will fail
@skurfer
Copy link
Member

@skurfer skurfer commented Dec 8, 2016

Added some commits so we can get a release out @tiennou. Let me know what you think.

As for the panel getting detached from the interface, it seems to happen only if I build on 10.10 and run on 10.12. Running QS on the same machine I build from always seems to work.

On that subject… Is there any reason to keep building on 10.10? We’re going to disable ATS. Were there any other reasons? (Also, since we require 10.10 now, I’m going to update the deployment target and fix the OS version code in another pull request.)

@skurfer
Copy link
Member

@skurfer skurfer commented Dec 8, 2016

One more commit, but this isn’t ready. Even if you choose to replace the destination, it fails because it already exists.

@skurfer
Copy link
Member

@skurfer skurfer commented Dec 9, 2016

The problem with replacing files seems to be from very old code.

https://github.com/quicksilver/Quicksilver/blob/master/Quicksilver/PlugIns-Main/QSCorePlugIn/Code/QSActionProvider_EmbeddedProviders.m#L669

Doesn’t that mean the files will never be replaced, even when you explicitly approve it? What am I missing?

Anyway, no need to hold this up for that issue.

@skurfer skurfer merged commit e09f9e1 into master Dec 9, 2016
1 check passed
@skurfer skurfer deleted the t/fix-frenzy branch Dec 9, 2016
skurfer added a commit that referenced this issue Dec 9, 2016
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