From eed5e78d59f47beb53919bc7b77b7101fe07734b Mon Sep 17 00:00:00 2001 From: Remi Gau Date: Tue, 8 Sep 2020 16:06:35 +0200 Subject: [PATCH 1/2] make sure that userInput initializes cfg before running --- lib/bids-matlab | 2 +- src/userInputs.m | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/bids-matlab b/lib/bids-matlab index 71257b51..dd04a370 160000 --- a/lib/bids-matlab +++ b/lib/bids-matlab @@ -1 +1 @@ -Subproject commit 71257b51986f5075bb903eb090fe28b9b6dc3ebf +Subproject commit dd04a3709dcbfd04255cd43ef1caced94872ddc8 diff --git a/src/userInputs.m b/src/userInputs.m index 2f8ed4c0..ee26bdcf 100644 --- a/src/userInputs.m +++ b/src/userInputs.m @@ -14,6 +14,8 @@ if nargin < 1 cfg = struct('debug', []); end + + cfg = checkCFG(cfg); [cfg, responses] = setDefaultResponses(cfg); From a1edacd00898bf151af96a6b02a627d37dfd6acc Mon Sep 17 00:00:00 2001 From: Remi Gau Date: Tue, 8 Sep 2020 20:06:25 +0200 Subject: [PATCH 2/2] mh fix --- src/userInputs.m | 2 +- tests/test_checkCFG.m | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/userInputs.m b/src/userInputs.m index ee26bdcf..1d9c3481 100644 --- a/src/userInputs.m +++ b/src/userInputs.m @@ -14,7 +14,7 @@ if nargin < 1 cfg = struct('debug', []); end - + cfg = checkCFG(cfg); [cfg, responses] = setDefaultResponses(cfg); diff --git a/tests/test_checkCFG.m b/tests/test_checkCFG.m index 1f667a20..5deb56c4 100644 --- a/tests/test_checkCFG.m +++ b/tests/test_checkCFG.m @@ -89,7 +89,7 @@ function test_checkCfgBasic() expectedCfgStructure.subject.askGrpSess = [true true]; expectedCfgStructure.verbose = 0; - + expectedCfgStructure.useGUI = false; expectedCfgStructure.fileName.task = '';