Merge remote-tracking branch 'origin/patch'

This commit is contained in:
ghidra1 2019-12-05 11:48:31 -05:00
commit e07c83334d
11 changed files with 43 additions and 50 deletions

View file

@ -15,7 +15,7 @@
*/
package help.screenshot;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.*;
import java.io.IOException;
@ -58,9 +58,9 @@ public class VersionControlSlowScreenShots extends GhidraScreenShotGenerator {
public void tearDown() throws Exception {
// super.tearDown(); don't do this; use our tool instead
frontEnd.dispose();
if (frontEnd != null) {
frontEnd.dispose();
}
showResults();
}