Version 1.4.0 merge from development. #6

Merged
andrewlalis merged 13 commits from development into master 2017-07-03 11:28:00 +00:00
2 changed files with 5 additions and 1 deletions
Showing only changes of commit ce618179fd - Show all commits

View File

@ -89,7 +89,9 @@ public class HandieBot {
if (args.length >= 1) { if (args.length >= 1) {
if (args[0].equalsIgnoreCase("-nogui")){ if (args[0].equalsIgnoreCase("-nogui")){
System.out.println("Starting with no GUI.");
USE_GUI = false; USE_GUI = false;
log = new BotLog(null);
} }
} }

View File

@ -42,7 +42,9 @@ public class BotLog {
public BotLog(JTextPane outputArea){ public BotLog(JTextPane outputArea){
this.outputArea = outputArea; this.outputArea = outputArea;
initStyles(); if (outputArea != null) {
initStyles();
}
} }
/** /**