From 2e643fd215b68a876ac3e5f9aba721fdd3ac6f8e Mon Sep 17 00:00:00 2001
From: ebner <simon.ebner@psi.ch>
Date: Tue, 14 Apr 2015 14:42:50 +0200
Subject: [PATCH] fixed file close CTRLHA-109

---
 src/main/java/ch/psi/imagej/hdf5/ImagePlusHDF5.java  | 12 +++++++++---
 src/main/java/ch/psi/imagej/hdf5/SelectionPanel.java |  1 +
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/ch/psi/imagej/hdf5/ImagePlusHDF5.java b/src/main/java/ch/psi/imagej/hdf5/ImagePlusHDF5.java
index 722509e..7359c13 100644
--- a/src/main/java/ch/psi/imagej/hdf5/ImagePlusHDF5.java
+++ b/src/main/java/ch/psi/imagej/hdf5/ImagePlusHDF5.java
@@ -11,9 +11,15 @@ public class ImagePlusHDF5 extends ImagePlus {
 	
 	
 	private static final Logger logger = Logger.getLogger(ImagePlusHDF5.class.getName());
+	private VirtualStackHDF5 stack;
 	
 	public ImagePlusHDF5(String title, ImageStack stack) {
 		super(title, stack);
+		if(stack instanceof VirtualStackHDF5){
+			logger.info("VirtualStackHDF5");
+			this.stack = (VirtualStackHDF5) stack;
+		}
+		
 	}
 	
 	@Override
@@ -49,9 +55,9 @@ public class ImagePlusHDF5 extends ImagePlus {
 			@Override
 			public void windowClosed(WindowEvent e) {
 				logger.info("Closed");
-				ImageStack stack = getStack();
-				if(stack instanceof VirtualStackHDF5){
-					((VirtualStackHDF5) stack).close();
+				
+				if(stack!=null){
+					stack.close();
 				}
 			}
 			
diff --git a/src/main/java/ch/psi/imagej/hdf5/SelectionPanel.java b/src/main/java/ch/psi/imagej/hdf5/SelectionPanel.java
index 6def54e..f61f40a 100644
--- a/src/main/java/ch/psi/imagej/hdf5/SelectionPanel.java
+++ b/src/main/java/ch/psi/imagej/hdf5/SelectionPanel.java
@@ -54,6 +54,7 @@ public class SelectionPanel extends JPanel {
 
 			}
 		});
+		list.setSelectedIndex(0);
 	    
 	    JScrollPane scroll = new JScrollPane(list);
 	    scroll.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS);