From bd19e180444059011a394d3bd2d30548cc1f9c21 Mon Sep 17 00:00:00 2001 From: Chris Turner Date: Wed, 19 Aug 2020 21:59:11 -0500 Subject: [PATCH 1/2] +dj/conn.m: default to nogui when running with -nodesktop (see #278) --- +dj/conn.m | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/+dj/conn.m b/+dj/conn.m index b6c4cf10..f6c2fc94 100644 --- a/+dj/conn.m +++ b/+dj/conn.m @@ -27,7 +27,11 @@ % get password prompt option if nargin < 7 || isempty(nogui) - nogui = false; + if usejava('desktop') + nogui = false; + else + nogui = true; + end end @@ -118,4 +122,7 @@ if nargout==0 query(connObj, 'SELECT connection_id()') -end \ No newline at end of file +end + +end + From 2bd34b2838f34e96fa699d42c001ce749b832f6f Mon Sep 17 00:00:00 2001 From: Chris Turner Date: Fri, 11 Sep 2020 21:32:59 -0500 Subject: [PATCH 2/2] ./+dj/conn.m - adjust usejava(desktop) setting of nogui --- +dj/conn.m | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/+dj/conn.m b/+dj/conn.m index f6c2fc94..09c1deff 100644 --- a/+dj/conn.m +++ b/+dj/conn.m @@ -27,11 +27,7 @@ % get password prompt option if nargin < 7 || isempty(nogui) - if usejava('desktop') - nogui = false; - else - nogui = true; - end + nogui = ~usejava('desktop'); end