Skip to content

Commit

Permalink
Fix compile errors
Browse files Browse the repository at this point in the history
  • Loading branch information
ctrueden committed Sep 28, 2024
1 parent bf55b3d commit 1941776
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/main/java/ini/trakem2/persistence/DBLoader.java
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ini/trakem2/persistence/Loader.java
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down

0 comments on commit 1941776

Please sign in to comment.