Skip to content

Restore empty tmp cursor to parent window cursor #21576

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
TurboGit merged 2 commits into from
Jul 20, 2026
Merged

Restore empty tmp cursor to parent window cursor #21576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2adc60f
Restore empty tmp cursor to parent window cursor
jenshannoschwalm Jul 19, 2026
4c2ff1a
Don't double free module memory if loading failed
jenshannoschwalm Jul 19, 2026
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
7 changes: 6 additions & 1 deletion src/control/control.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,12 @@ void dt_control_set_temp_cursor(const char *cursor_name)
void dt_control_clear_temp_cursor()
{
GdkWindow *window = gtk_widget_get_window(dt_ui_main_window(darktable.gui->ui));
if(!_prev_cursor) return;
if(!_prev_cursor)
{
if(window)
gdk_window_set_cursor(window, NULL);
return;
}
if(window)
gdk_window_set_cursor(window, _prev_cursor);
g_object_unref(_prev_cursor);
Expand Down
2 changes: 1 addition & 1 deletion src/develop/develop.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3526,7 +3526,7 @@ dt_iop_module_t *dt_dev_module_duplicate_ext(dt_develop_t *dev,
dt_iop_module_t *module = calloc(1, sizeof(dt_iop_module_t));
if(dt_iop_load_module(module, base->so, base->dev))
{
free(module);
// failed module already freed while failing to load
return NULL;
}
module->instance = base->instance;
Expand Down
Loading