Changed code so that a call to generate a timeline while ingest is occurring

is handled properly.
This commit is contained in:
Tim McIver 2013-02-12 12:32:41 -05:00
parent 6f4ff9f23f
commit 59c94f46f5

View File

@ -955,12 +955,19 @@ public class Simile2 extends CallableSystemAction implements Presenter.Toolbar,
try {
if (Case.getCurrentCase().getImages().isEmpty()) {
logger.log(Level.INFO, "Error creating timeline, there are no images to parse");
} else if (IngestManager.getDefault().isIngestRunning()) {
int i = JOptionPane.showConfirmDialog(new JFrame(), "You are trying to generate a timeline before ingest has been completed. The timeline may be incomplete. Do you want to continue?");
if (i != JOptionPane.YES_OPTION) {
return;
}
} else {
if (IngestManager.getDefault().isIngestRunning()) {
int answer = JOptionPane.showConfirmDialog(new JFrame(),
"You are trying to generate a timeline before "
+ "ingest has been completed. The timeline may be "
+ "incomplete. Do you want to continue?", "Timeline",
JOptionPane.YES_NO_OPTION);
if (answer != JOptionPane.YES_OPTION) {
return;
}
}
logger.log(Level.INFO, "Beginning generation of timeline");
// if the timeline window is already open, do nothing