mobeigi
/
filebot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure that FormatDialog never throws an exception during initialization 

* https://www.filebot.net/forums/viewtopic.php?f=10&t=4976
This commit is contained in:
Reinhard Pointner 2017-04-22 22:33:38 +08:00
parent aff5407a1a
commit e312e23680
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/net/filebot/ui/rename/FormatDialog.java
View File

@ -278,7 +278,7 @@ public class FormatDialog extends JDialog {
if (bindings == null) {
bindings = restoreSample(initMode);
} else if (bindings.getFileObject() == null && !locked) {
bindings = new MediaBindingBean(bindings.getInfoObject(), restoreSample(initMode).getMediaFile());
bindings = new MediaBindingBean(bindings.getInfoObject(), restoreSample(initMode).getFileObject());
}
// initialize data
@ -428,14 +428,13 @@ public class FormatDialog extends JDialog {
try {
// restore sample from user preferences
String sample = mode.persistentSample().getValue();
info = MetaAttributes.toObject(sample);
if (info == null) {
throw new NullPointerException();
}
info = MetaAttributes.toObject(mode.persistentSample().getValue());
} catch (Exception e) {
// restore sample from application properties
debug.log(Level.WARNING, e, e::toString);
}
// restore sample from application properties if necessary
if (info == null) {
info = mode.getDefaultSampleObject();
}