From e4afd12a9bc970141090d0aa34ca415530879cae Mon Sep 17 00:00:00 2001
From: antisnatchor <antisnatchor@gmail.com>
Date: Thu, 10 Dec 2015 15:00:02 +0100
Subject: [PATCH] Fixed Flash detection on IE11, thanks @badbob as this was
 originally part of his pull request which I haven't merged earlier ;-)

---
 core/main/client/browser.js | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/core/main/client/browser.js b/core/main/client/browser.js
index 5f1b9c54b..e788eab22 100644
--- a/core/main/client/browser.js
+++ b/core/main/client/browser.js
@@ -1883,17 +1883,21 @@ beef.browser = {
             flash_versions = 12;
             flash_installed = false;
 
-            if (window.ActiveXObject) {
-                for (x = 2; x <= flash_versions; x++) {
-                    try {
-                        Flash = eval("new ActiveXObject('ShockwaveFlash.ShockwaveFlash." + x + "');");
-                        if (Flash) {
-                            flash_installed = true;
+
+            if (this.type().IE11) {
+                flash_installed = (navigator.plugins["Shockwave Flash"] != undefined);
+            } else {
+                if (window.ActiveXObject != null) {
+                    for (x = 2; x <= flash_versions; x++) {
+                        try {
+                            Flash = eval("new ActiveXObject('ShockwaveFlash.ShockwaveFlash." + x + "');");
+                            if (Flash) {
+                                flash_installed = true;
+                            }
+                        } catch (e) {
+                            beef.debug("Creating Flash ActiveX object failed: " + e.message);
                         }
                     }
-                    catch (e) {
-                        beef.debug("Creating Flash ActiveX object failed: " + e.message);
-                    }
                 }
             }
             return flash_installed;