From c1fbf8fbb3816e2a1d9a442854e534e979016bd9 Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Wed, 22 Feb 2012 08:16:13 +0000 Subject: [PATCH] * fixed bug that 'caused cellrenderer to crash --- .../filebot/ui/rename/RenameListCellRenderer.java | 2 +- source/net/sourceforge/filebot/ui/rename/RenamePanel.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/net/sourceforge/filebot/ui/rename/RenameListCellRenderer.java b/source/net/sourceforge/filebot/ui/rename/RenameListCellRenderer.java index 74aae63d..142b631e 100644 --- a/source/net/sourceforge/filebot/ui/rename/RenameListCellRenderer.java +++ b/source/net/sourceforge/filebot/ui/rename/RenameListCellRenderer.java @@ -77,7 +77,7 @@ class RenameListCellRenderer extends DefaultFancyListCellRenderer { } } - if (renameModel.preserveExtension() && renameModel.getMatch(index).getCandidate() != null) { + if (renameModel.preserveExtension() && renameModel.hasComplement(index)) { typeRenderer.setText(getType(renameModel.getMatch(index).getCandidate())); typeRenderer.setVisible(true); } diff --git a/source/net/sourceforge/filebot/ui/rename/RenamePanel.java b/source/net/sourceforge/filebot/ui/rename/RenamePanel.java index 8291505e..073e708d 100644 --- a/source/net/sourceforge/filebot/ui/rename/RenamePanel.java +++ b/source/net/sourceforge/filebot/ui/rename/RenamePanel.java @@ -381,9 +381,6 @@ public class RenamePanel extends JComponent { return; } - // auto-match in progress - namesList.firePropertyChange(LOADING_PROPERTY, false, true); - // clear names list renameModel.values().clear(); @@ -431,6 +428,9 @@ public class RenamePanel extends JComponent { } }; + // auto-match in progress + namesList.firePropertyChange(LOADING_PROPERTY, false, true); + worker.execute(); } }