Skip to content

Fixes #15: Adds retry to shortcut creation to handle file contention #22

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

Merged
zooba merged 1 commit into from
Apr 29, 2025
Merged

Fixes #15: Adds retry to shortcut creation to handle file contention #22

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
18 changes: 15 additions & 3 deletions src/_native/shortcut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,23 @@ shortcut_create(PyObject *, PyObject *args, PyObject *kwargs)
err_SetFromWindowsErrWithMessage(hr, "Setting shortcut icon");
goto done;
}
if (FAILED(hr = lnk->QueryInterface(&persist)) ||
FAILED(hr = persist->Save(path, 0))) {
err_SetFromWindowsErrWithMessage(hr, "Writing shortcut");
if (FAILED(hr = lnk->QueryInterface(&persist))) {
err_SetFromWindowsErrWithMessage(hr, "Getting persist interface");
goto done;
}
// gh-15: Apparently ERROR_USER_MAPPED_FILE can occur here, which suggests
// contention on the file. We should be able to sleep and retry to handle it
// in most cases.
for (int retries = 5; retries; --retries) {
if (SUCCEEDED(hr = persist->Save(path, 0))) {
break;
}
if (retries == 1 || hr != HRESULT_FROM_WIN32(ERROR_USER_MAPPED_FILE)) {
err_SetFromWindowsErrWithMessage(hr, "Writing shortcut");
goto done;
}
Sleep(10);
}

r = Py_NewRef(Py_None);

Expand Down