aboutsummaryrefslogtreecommitdiff
path: root/src/gui_project.c
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2020-10-22 18:28:25 +0200
committerThomas White <taw@physics.org>2020-10-22 18:28:25 +0200
commit65f7ff44d6a5461f2392b644a0c4e03b550d4975 (patch)
tree5c9088a10d1cd04d6ac6ee83c60ed67e790a8656 /src/gui_project.c
parent5d09bcdda5ee7bcec251051eb24ec41e3f06b650 (diff)
Skeleton for merging via GUI
Diffstat (limited to 'src/gui_project.c')
-rw-r--r--src/gui_project.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui_project.c b/src/gui_project.c
index fe2f72c0..83d9f083 100644
--- a/src/gui_project.c
+++ b/src/gui_project.c
@@ -680,8 +680,10 @@ void default_project(struct crystfelproject *proj)
proj->indexing_opts = NULL;
proj->n_running_tasks = 0;
proj->indexing_new_job_title = NULL;
+ proj->merge_new_job_title = NULL;
proj->indexing_backend_selected = 0;
+ proj->merge_backend_selected = 0;
proj->n_backends = 0;
proj->backends = malloc(2*sizeof(struct crystfel_backend));
/* FIXME: Crappy error handling */