diff --git a/src/main/java/ini/trakem2/persistence/DBLoader.java b/src/main/java/ini/trakem2/persistence/DBLoader.java index c8d3935b..745b6b43 100644 --- a/src/main/java/ini/trakem2/persistence/DBLoader.java +++ b/src/main/java/ini/trakem2/persistence/DBLoader.java @@ -94,7 +94,7 @@ public class DBLoader extends Loader { private Connection connection = null; static private boolean driver_loaded = false; - private Monitor monitor = null; + //private Monitor monitor = null; /** Check if settings are in. */ public boolean isReady() { @@ -369,7 +369,7 @@ private boolean connectToDatabase() { connection = DriverManager.getConnection("jdbc:postgresql:" + (db_host.equals("") || db_host.equals("localhost") ? "" : "//" + db_host + (db_port.equals("") ? "" : ":" + db_port + "/")) + db_name, db_user, db_pw); prepareStatements(); if (null != connection) { - if (null != monitor) monitor.quit(); // kill any previous monitors before launching a new one + //if (null != monitor) monitor.quit(); // kill any previous monitors before launching a new one // TODO gets in the way of the GUI too much // monitor = new Monitor(connection); // monitor.start(); diff --git a/src/main/java/ini/trakem2/persistence/Loader.java b/src/main/java/ini/trakem2/persistence/Loader.java index 7efde9ea..029a5302 100644 --- a/src/main/java/ini/trakem2/persistence/Loader.java +++ b/src/main/java/ini/trakem2/persistence/Loader.java @@ -4239,7 +4239,7 @@ static public final void flush(final ImagePlus imp) { if (null != roi) roi.setImage(null); //final ImageProcessor ip = imp.getProcessor(); // the nullifying makes no difference, and in low memory situations some bona fide imagepluses may end up failing on the calling method because of lack of time to grab the processor etc. //if (null != ip) ip.setPixels(null); - ipa.notifyListeners(imp, ipa.CLOSE); + ipa.notifyListeners(imp, 1 /*ImagePlus.CLOSED*/); } /** Returns the user's home folder unless overriden. */