aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2021-02-17 11:58:40 +0100
committerThomas White <taw@physics.org>2021-02-17 11:58:40 +0100
commitf5299db7a366bba35c9a57000da72b99597d145a (patch)
treedea2f08fc29c9435d7351f8830c6669f3e7bacfb
parent87736eb01c7b9ca7d87680a897210e407ac0de0e (diff)
GUI: Prevent opening multiple merging windows
-rw-r--r--src/gui_merge.c2
-rw-r--r--src/gui_project.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/src/gui_merge.c b/src/gui_merge.c
index 44bf2846..ae94fd30 100644
--- a/src/gui_merge.c
+++ b/src/gui_merge.c
@@ -268,6 +268,8 @@ gint merge_sig(GtkWidget *widget, struct crystfelproject *proj)
int i;
struct new_merging_job_params *njp;
+ if ( proj->merging_opts != NULL ) return FALSE;
+
njp = malloc(sizeof(struct new_merging_job_params));
if ( njp == NULL ) return FALSE;
diff --git a/src/gui_project.c b/src/gui_project.c
index f053a1cc..0059fb57 100644
--- a/src/gui_project.c
+++ b/src/gui_project.c
@@ -1025,6 +1025,7 @@ void default_project(struct crystfelproject *proj)
proj->dtempl = NULL;
proj->cur_image = NULL;
proj->indexing_opts = NULL;
+ proj->merging_opts = NULL;
proj->n_running_tasks = 0;
proj->indexing_new_job_title = NULL;
proj->merging_new_job_title = NULL;