From 94745fb0133fe29e8da318183bb5ea56ee94ebd8 Mon Sep 17 00:00:00 2001 From: Daniel van Noord Date: Wed, 2 Dec 2020 13:24:56 +0100 Subject: [PATCH] Avoid crash on double-loading --- CookieMonster.js | 27 ++++++++++++++++++--------- src/Footer.js | 6 +++++- src/Header.js | 21 +++++++++++++-------- 3 files changed, 36 insertions(+), 18 deletions(-) diff --git a/CookieMonster.js b/CookieMonster.js index a9a2b8b..9803540 100644 --- a/CookieMonster.js +++ b/CookieMonster.js @@ -1,22 +1,27 @@ /********** * Header * **********/ +RunCookieMonsterHeader = function() { + CM = {}; -CM = {}; + CM.Backup = {}; -CM.Backup = {}; + CM.Cache = {}; -CM.Cache = {}; + CM.Config = {}; -CM.Config = {}; + CM.ConfigData = {}; -CM.ConfigData = {}; + CM.Data = {}; -CM.Data = {}; + CM.Disp = {}; -CM.Disp = {}; + CM.Sim = {}; +} -CM.Sim = {}; +if (typeof CM == "undefined") { + RunCookieMonsterHeader(); +} /********* * Cache * @@ -4598,4 +4603,8 @@ CM.Sim.SellBuildingsForChoEgg = function() { * Footer * **********/ -CM.Init(); +if (!CM.isRunning) { + CM.Init(); + CM.isRunning = 1 +} + diff --git a/src/Footer.js b/src/Footer.js index 3a2fc97..c40dd31 100644 --- a/src/Footer.js +++ b/src/Footer.js @@ -2,4 +2,8 @@ * Footer * **********/ -CM.Init(); +if (!CM.isRunning) { + CM.Init(); + CM.isRunning = 1 +} + diff --git a/src/Header.js b/src/Header.js index 7e91767..26893fb 100644 --- a/src/Header.js +++ b/src/Header.js @@ -1,20 +1,25 @@ /********** * Header * **********/ +RunCookieMonsterHeader = function() { + CM = {}; -CM = {}; + CM.Backup = {}; -CM.Backup = {}; + CM.Cache = {}; -CM.Cache = {}; + CM.Config = {}; -CM.Config = {}; + CM.ConfigData = {}; -CM.ConfigData = {}; + CM.Data = {}; -CM.Data = {}; + CM.Disp = {}; -CM.Disp = {}; + CM.Sim = {}; +} -CM.Sim = {}; +if (typeof CM == "undefined") { + RunCookieMonsterHeader(); +}