From 5fe88ff58df54d604c842895c427cb665144572b Mon Sep 17 00:00:00 2001
From: Emmastone <capslock_donater@hotmail.com>
Date: Sun, 16 Oct 2016 13:00:52 +0100
Subject: [PATCH 1/2] [BUGFIX] Fixed merge issues

---
 src/main/java/org/parabot/core/ui/BotUI.java  |  8 +++++++-
 src/main/java/org/parabot/core/ui/Logger.java | 12 ++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/parabot/core/ui/BotUI.java b/src/main/java/org/parabot/core/ui/BotUI.java
index 95b9972..7841006 100644
--- a/src/main/java/org/parabot/core/ui/BotUI.java
+++ b/src/main/java/org/parabot/core/ui/BotUI.java
@@ -151,7 +151,7 @@ public class BotUI extends JFrame implements ActionListener, ComponentListener,
         this.performCommand(e.getActionCommand());
     }
 
-    public void performCommand(String command){
+    public void performCommand(String command) {
         switch (command) {
             case "Create screenshot":
                 try {
@@ -218,6 +218,12 @@ public class BotUI extends JFrame implements ActionListener, ComponentListener,
                 pauseScript = true;
                 break;
             case "Stop":
+                if (pauseScript) {
+                    pauseScript = false;
+                    pause.setEnabled(false);
+                    run.setEnabled(true);
+                    stop.setEnabled(false);
+                }
                 setScriptState(Script.STATE_STOPPED);
                 break;
             case "Logger":
diff --git a/src/main/java/org/parabot/core/ui/Logger.java b/src/main/java/org/parabot/core/ui/Logger.java
index 640216c..73424ff 100644
--- a/src/main/java/org/parabot/core/ui/Logger.java
+++ b/src/main/java/org/parabot/core/ui/Logger.java
@@ -4,6 +4,8 @@ import org.parabot.core.ui.components.GamePanel;
 
 import javax.swing.*;
 import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 /**
  * @author JKetelaar
@@ -23,6 +25,16 @@ public class Logger extends JPanel {
         JScrollPane pane = new JScrollPane(list);
         add(pane, BorderLayout.CENTER);
 
+        JButton button = new JButton("Clear Logger");
+        button.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                clearLogger();
+                addMessage("Logger cleared", false);
+            }
+        });
+        add(button, BorderLayout.SOUTH);
+
         list.setCellRenderer(getRenderer());
 
         model = new DefaultListModel<>();

From 21876c2541db5b646d74a57cb37194f68fb47bb9 Mon Sep 17 00:00:00 2001
From: Emmastone <capslock_donater@hotmail.com>
Date: Sun, 16 Oct 2016 13:42:08 +0100
Subject: [PATCH 2/2] [CLEANUP] Fixed the message on cleaning

---
 src/main/java/org/parabot/core/ui/Logger.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/parabot/core/ui/Logger.java b/src/main/java/org/parabot/core/ui/Logger.java
index 73424ff..172d798 100644
--- a/src/main/java/org/parabot/core/ui/Logger.java
+++ b/src/main/java/org/parabot/core/ui/Logger.java
@@ -30,7 +30,7 @@ public class Logger extends JPanel {
             @Override
             public void actionPerformed(ActionEvent e) {
                 clearLogger();
-                addMessage("Logger cleared", false);
+                addMessage("Logger started", false);
             }
         });
         add(button, BorderLayout.SOUTH);