LMU/musrfit
LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 3 Activity

Merged muonspin/musrfit:root6 into master

Browse Source
This commit is contained in:
Zaher Salman 2019-11-11 09:29:40 +01:00
commit 63a1b1c1f3
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -1,6 +1,10 @@
# - musrfit # - musrfit
cmake_minimum_required(VERSION 3.9) cmake_minimum_required(VERSION 3.9)
if (CMAKE_VERSION GREATER_EQUAL 3.12)
cmake_policy(SET CMP0075 NEW)
endif (CMAKE_VERSION GREATER_EQUAL 3.12)
project(musrfit VERSION 1.5.1 LANGUAGES C CXX) project(musrfit VERSION 1.5.1 LANGUAGES C CXX)
#--- musrfit specific options ------------------------------------------------- #--- musrfit specific options -------------------------------------------------

6
src/musredit_qt5/mupp/PmuppGui.cpp
View File

@ -371,8 +371,12 @@ PmuppGui::PmuppGui( QStringList fln, QWidget *parent, Qt::WindowFlags f )
setCentralWidget(fCentralWidget); setCentralWidget(fCentralWidget);
// in case there is no db/dat file list given open the db/dat file open menu automatically. // in case there is no db/dat file list given open the db/dat file open menu automatically.
if (fln.size() == 0) if (fln.size() == 0) {
fileOpen(); fileOpen();
if (fParamDataHandler->GetNoOfCollections() == 0) { // file open dialog has been cancelled
exit(0);
}
}
} }
//---------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------