diff --git a/app/index.html b/app/index.html
index 4571e65..b345e98 100644
--- a/app/index.html
+++ b/app/index.html
@@ -157,6 +157,17 @@
var data = electron.app.getPath('userData');
+ function load() {
+ var branch = require('path').basename(data).substr(7);
+ electron.BrowserWindow.addExtension(data + '/crxpwn');
+ electron.getCurrentWindow().loadURL('https://' + (branch && branch != 'development' ? branch + '.' : '') + 'discordapp.com/channels/@me');
+ }
+
+ if (window.betterDiscordIPC) {
+ alert('EndPwn3 is not compatible with BetterDiscord\n\nPress OK to return to Discord', 'EndPwn3: Framework Conflict');
+ load();
+ }
+
// asarpwn (as a removal tool)
function asarinject(sig, inj) {
var dirlisting = fs.readdirSync(data);
@@ -196,15 +207,6 @@
alert(ex, 'asarpwn3');
}
- // get the data path
- var data = electron.app.getPath('userData');
-
- function load() {
- var branch = require('path').basename(data).substr(7);
- electron.BrowserWindow.addExtension(data + '/crxpwn');
- electron.getCurrentWindow().loadURL('https://' + (branch && branch != 'development' ? branch + '.' : '') + 'discordapp.com/channels/@me');
- }
-
if (!fs.existsSync(data + '/crxpwn')) {
fs.mkdirSync(data + '/crxpwn');
fs.writeFileSync(data + '/crxpwn/manifest.json', '{"manifest_version":2,"name":"crxpwn","description":"asarpwn-less preload scripts for the masses ;)","version":"1.0","content_scripts":[{"js":["payload.js"],"matches":["*://*/*"],"run_at":"document_start","all_frames":true}]}');