Skip to content

Fix data loss: save-and-delete in the favorites store deleted from the main list #12

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.

Sign up for GitHub

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

Open
MiMoHo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix data loss: save-and-delete in the favorites store deleted from the main list #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions AppController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1187,16 +1187,21 @@ - (void)processBezelKeyDown:(NSEvent *)theEvent {
case 's': case 'S': // Save / Save-and-delete
{
bool success = [flycutOperator saveFromStack];
[self performSelector:@selector(hideApp) withObject:nil afterDelay:0.2];
[self restoreStashedStoreAndUpdate];

if ( success ) {
if ( modifiers & NSEventModifierFlagShift ) {
[flycutOperator clearItemAtStackPosition];
[self updateBezel];
[self updateMenu];
}
// Delete while the store that was saved from is still the current one.
// -restoreStashedStore swaps the store AND the stack position back, so
// deleting after it removed an entry from the main list - at whatever
// position the user had been at there - instead of the clipping that had
// just been saved. Saving a favorite therefore destroyed an unrelated
// clipping.
if ( success && ( modifiers & NSEventModifierFlagShift ) ) {
[flycutOperator clearItemAtStackPosition];
[self updateBezel];
[self updateMenu];
}

[self performSelector:@selector(hideApp) withObject:nil afterDelay:0.2];
[self restoreStashedStoreAndUpdate];
}
break;
case 'f':
Expand Down