Merge pull request #30 from augustd/tools-scope-bug

Enabled status should not influence selected
augustd · Feb 2, 2018 · e665676 · e665676
2 parents 5c81252 + 34bd88b
commit e665676
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.codemagi</groupId>
     <artifactId>burp-suite-utils</artifactId>
-    <version>1.2.0</version>
+    <version>1.2.1</version>
     <packaging>jar</packaging>
     <name>Burp Suite Utils</name>
     <description>The Burp Suite Utils project provides developers with APIs for building Burp Suite Extensions.</description>

diff --git a/src/main/java/com/monikamorrow/burp/ToolsScopeComponent.java b/src/main/java/com/monikamorrow/burp/ToolsScopeComponent.java
@@ -133,25 +133,25 @@ public boolean isToolSelected(int tool) {
         boolean selected = false;
         switch (tool) {
             case IBurpExtenderCallbacks.TOOL_PROXY:
-                selected = jCheckBoxProxy.isSelected() && jCheckBoxProxy.isEnabled();
+                selected = jCheckBoxProxy.isSelected();
                 break;
             case IBurpExtenderCallbacks.TOOL_REPEATER:
-                selected = jCheckBoxRepeater.isSelected() && jCheckBoxRepeater.isEnabled();
+                selected = jCheckBoxRepeater.isSelected();
                 break;
             case IBurpExtenderCallbacks.TOOL_SCANNER:
-                selected = jCheckBoxScanner.isSelected() && jCheckBoxScanner.isEnabled();
+                selected = jCheckBoxScanner.isSelected();
                 break;
             case IBurpExtenderCallbacks.TOOL_INTRUDER:
-                selected = jCheckBoxIntruder.isSelected() && jCheckBoxIntruder.isEnabled();
+                selected = jCheckBoxIntruder.isSelected();
                 break;
             case IBurpExtenderCallbacks.TOOL_SEQUENCER:
-                selected = jCheckBoxSequencer.isSelected() && jCheckBoxSequencer.isEnabled();
+                selected = jCheckBoxSequencer.isSelected();
                 break;
             case IBurpExtenderCallbacks.TOOL_SPIDER:
-                selected = jCheckBoxSpider.isSelected() && jCheckBoxSpider.isEnabled();
+                selected = jCheckBoxSpider.isSelected();
                 break;
             case IBurpExtenderCallbacks.TOOL_EXTENDER:
-                selected = jCheckBoxExtender.isSelected() && jCheckBoxExtender.isEnabled();
+                selected = jCheckBoxExtender.isSelected();
                 break;
             case IBurpExtenderCallbacks.TOOL_TARGET:
                 break;