git://git.nikiroo.be
/
jvcard.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Fix FN when empty (with a configurable option) + some i18n
[jvcard.git]
/
src
/
be
/
nikiroo
/
jvcard
/
tui
/
panes
/
FileList.java
diff --git
a/src/be/nikiroo/jvcard/tui/panes/FileList.java
b/src/be/nikiroo/jvcard/tui/panes/FileList.java
index 7065aaf679a6a0290c1ec7de401a716dd7a736bf..376aae9feb503e7c8c492fa3c5d3ca2c2fa74c90 100644
(file)
--- 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");