diff options
| author | Thomas White <taw@physics.org> | 2021-05-28 16:59:16 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2021-05-28 17:00:00 +0200 |
| commit | 6dd95c2333dad91539f15f198e3d584f54bcaaa7 (patch) | |
| tree | 3f19bb186d0145f8a06ae97fa16499339be6b7b9 /src/gui_import.c | |
| parent | 2b07915297c45477b473f4c30feeba0978e0c99a (diff) | |
GUI: Store relative paths of results
This allows project folders to be relocated more easily.
At the same time, I fixed the weird ownership semantics of
add_indexing_result and add_merge_result.
Fixes: https://gitlab.desy.de/thomas.white/crystfel/-/issues/31
Diffstat (limited to 'src/gui_import.c')
| -rw-r--r-- | src/gui_import.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/gui_import.c b/src/gui_import.c index 4328cacf..3e432075 100644 --- a/src/gui_import.c +++ b/src/gui_import.c @@ -249,7 +249,7 @@ int load_stream(struct crystfelproject *proj, char *stream_filename) Stream *st; DataTemplate *dtempl; const char *geom_str; - char **streams; + char *result_name; st = stream_open_for_read(stream_filename); if ( st == NULL ) return 1; @@ -280,13 +280,10 @@ int load_stream(struct crystfelproject *proj, char *stream_filename) proj->stream_filename = stream_filename; stream_close(st); - streams = malloc(sizeof(char *)); - if ( streams != NULL ) { - char *result_name = safe_basename(stream_filename); - streams[0] = strdup(stream_filename); - add_indexing_result(proj, result_name, streams, 1); - select_result(proj, result_name); - } + result_name = safe_basename(stream_filename); + add_indexing_result(proj, result_name, &stream_filename, 1); + select_result(proj, result_name); + free(result_name); return 0; } |