diff --git a/src/displayer.cpp b/src/displayer.cpp index 783452a5c..b6ab77ea1 100644 --- a/src/displayer.cpp +++ b/src/displayer.cpp @@ -2446,8 +2446,6 @@ int Displayer::runGui() win.display_labels.push_back(EMDL::label2Str(EMDL_MICROGRAPH_NAME)); if (MD.containsLabel(EMDL_MICROGRAPH_MOVIE_NAME)) win.display_labels.push_back(EMDL::label2Str(EMDL_MICROGRAPH_MOVIE_NAME)); - - } else { @@ -2457,7 +2455,7 @@ int Displayer::runGui() win.is_multi = (ZSIZE(img()) * NSIZE(img()) > 1); } - win.fill(fn_in); + return win.fill(fn_in); } diff --git a/src/macros.h b/src/macros.h index 236da18db..fc36aad34 100644 --- a/src/macros.h +++ b/src/macros.h @@ -45,7 +45,7 @@ #ifndef MACROS_H #define MACROS_H -#define RELION_VERSION "3.0.4" +#define RELION_VERSION "3.0.5" #include #include diff --git a/src/ml_optimiser.cpp b/src/ml_optimiser.cpp index 29e97bf8b..8af72546b 100644 --- a/src/ml_optimiser.cpp +++ b/src/ml_optimiser.cpp @@ -2058,7 +2058,6 @@ void MlOptimiser::calculateSumOfPowerSpectraAndAverageImage(MultidimArray