Skip to content

Commit 8df4253

Browse files
jenshannoschwalmTurboGit
authored andcommitted
Fixing darktable-cli crash #18863
Can test "in-real" as without access to any windows system.
1 parent 0898cee commit 8df4253

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/control/progress.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ typedef struct _dt_progress_t
5959

6060
} _dt_progress_t;
6161

62-
static void global_progress_start(dt_control_t *control, dt_progress_t *progress)
62+
static void _global_progress_start(dt_control_t *control, dt_progress_t *progress)
6363
{
6464
control->progress_system.n_progress_bar++;
6565

@@ -105,7 +105,7 @@ static void global_progress_start(dt_control_t *control, dt_progress_t *progress
105105
#else // _WIN32
106106

107107
// we can't init this in dt_control_progress_init as it's run too early :/
108-
if(!control->progress_system.taskbarlist)
108+
if(!control->progress_system.taskbarlist && darktable.gui)
109109
{
110110
void *taskbarlist;
111111
if(CoCreateInstance(&CLSID_TaskbarList, NULL, CLSCTX_INPROC_SERVER, &IID_ITaskbarList3, (void **)&taskbarlist) == S_OK)
@@ -125,7 +125,7 @@ static void global_progress_start(dt_control_t *control, dt_progress_t *progress
125125
#endif
126126
}
127127

128-
static void global_progress_set(dt_control_t *control, dt_progress_t *progress, double value)
128+
static void _global_progress_set(dt_control_t *control, dt_progress_t *progress, double value)
129129
{
130130
control->progress_system.global_progress = MAX(control->progress_system.global_progress, value);
131131

@@ -174,7 +174,7 @@ static void global_progress_set(dt_control_t *control, dt_progress_t *progress,
174174
#endif
175175
}
176176

177-
static void global_progress_end(dt_control_t *control, dt_progress_t *progress)
177+
static void _global_progress_end(dt_control_t *control, dt_progress_t *progress)
178178
{
179179
control->progress_system.n_progress_bar--;
180180

@@ -303,7 +303,7 @@ dt_progress_t *dt_control_progress_create(const gboolean has_progress_bar,
303303
if(!control) return NULL;
304304

305305
dt_progress_t *progress = calloc(1, sizeof(dt_progress_t));
306-
dt_pthread_mutex_init(&(progress->mutex), NULL);
306+
dt_pthread_mutex_init(&progress->mutex, NULL);
307307

308308
// fill it with values
309309
progress->message = g_strdup(message);
@@ -314,7 +314,7 @@ dt_progress_t *dt_control_progress_create(const gboolean has_progress_bar,
314314
// add it to the global list
315315
control->progress_system.list = g_list_append(control->progress_system.list, progress);
316316
control->progress_system.list_length++;
317-
if(has_progress_bar) global_progress_start(control, progress);
317+
if(has_progress_bar) _global_progress_start(control, progress);
318318

319319
// tell the gui
320320
if(control->progress_system.proxy.module != NULL)
@@ -339,7 +339,7 @@ void dt_control_progress_destroy(dt_progress_t *progress)
339339
// remove the object from the global list
340340
control->progress_system.list = g_list_remove(control->progress_system.list, progress);
341341
control->progress_system.list_length--;
342-
if(progress->has_progress_bar) global_progress_end(control, progress);
342+
if(progress->has_progress_bar) _global_progress_end(control, progress);
343343

344344
dt_pthread_mutex_unlock(&control->progress_system.mutex);
345345

@@ -430,7 +430,7 @@ void dt_control_progress_set_progress(dt_progress_t *progress, double value)
430430
if(control->progress_system.proxy.module != NULL)
431431
control->progress_system.proxy.updated(control->progress_system.proxy.module, progress->gui_data, value);
432432

433-
if(progress->has_progress_bar) global_progress_set(control, progress, value);
433+
if(progress->has_progress_bar) _global_progress_set(control, progress, value);
434434

435435
dt_pthread_mutex_unlock(&control->progress_system.mutex);
436436
}

0 commit comments

Comments
 (0)