X-Git-Url: http://git.nikiroo.be/?p=jvcard.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fjvcard%2Ftui%2Fpanes%2FFileList.java;h=376aae9feb503e7c8c492fa3c5d3ca2c2fa74c90;hp=7065aaf679a6a0290c1ec7de401a716dd7a736bf;hb=3634193b7a8927e68a3ae3d38fff4f6bd36c4ee5;hpb=9b8cb729d5105f34eb4b1e5975166c6c5f867fa2

diff --git a/src/be/nikiroo/jvcard/tui/panes/FileList.java b/src/be/nikiroo/jvcard/tui/panes/FileList.java
index 7065aaf..376aae9 100644
--- a/src/be/nikiroo/jvcard/tui/panes/FileList.java
+++ b/src/be/nikiroo/jvcard/tui/panes/FileList.java
@@ -211,6 +211,10 @@ public class FileList extends MainContentList {
 
 	@Override
 	public String wakeup() throws IOException {
+		String s = super.wakeup();
+		if (s != null)
+			return s;
+
 		if (merger != null) {
 			if (!merger.mergeTargetFile.exists()) {
 				throw new IOException("Merge cancelled");