Tools/SCViewer
11
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed #20 - NPE gets caught when opening a damaged file and info popup

Browse Source 
is shown
This commit is contained in:
Brita Keller
2019-12-03 22:19:56 +01:00
parent 52f3f7b348
commit 7b2db09585
3 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java
View File

@ -74,7 +74,8 @@ import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.TypedListener;
import org.eclipse.swt.widgets.MessageBox;
import com.minres.scviewer.database.ITx;
import com.minres.scviewer.database.ITxEvent;
import com.minres.scviewer.database.ITxRelation;
@ -489,7 +490,17 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
job.addJobChangeListener(new JobChangeAdapter() {
@Override
public void done(IJobChangeEvent event) {
if (event.getResult().getCode() != Status.OK_STATUS.getCode()) return;
IStatus result = event.getResult();
if( (!result.isMultiStatus() && result.getCode() != Status.OK_STATUS.getCode() ) ||
(result.isMultiStatus() && result.getChildren().length > 0 && result.getChildren()[0].getCode() != Status.OK_STATUS.getCode() ) ){
// kill editor and pop up warning for user
sync.asyncExec(() -> {
final Display display = myParent.getDisplay();
MessageDialog.openWarning(display.getActiveShell(), "Error loading database", "Database cannot be loaded. Aborting...");
ePartService.hidePart(myPart, true);
});
return;
}
sync.asyncExec(()->{
waveformPane.setMaxTime(database.getMaxTime());
if (state != null)