From 5ceaa2b961b789ceb2aae7570660c09f9e88554d Mon Sep 17 00:00:00 2001
From: Martin Rudat <mrudat@toraboka.com>
Date: Thu, 11 Jun 2020 17:47:36 +1000
Subject: [PATCH 1/2] Update patcherService.js

---
 src/Services/patcherService.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Services/patcherService.js b/src/Services/patcherService.js
index 641860a..fb2ccfb 100644
--- a/src/Services/patcherService.js
+++ b/src/Services/patcherService.js
@@ -6,11 +6,16 @@ module.exports = function({ngapp, moduleUrl, fh}) {
 
         let service = this,
             patchers = [],
+            tabs = [];
+
+        this.resetTabs = function () {
             tabs = [{
                 label: 'Build Patches',
                 templateUrl: `${moduleUrl}/partials/buildPatches.html`,
                 controller: 'buildPatchesController'
             }];
+        }
+        this.resetTabs();
 
         // private functions
         let getAvailableFiles = function(patcher) {
@@ -187,6 +192,7 @@ module.exports = function({ngapp, moduleUrl, fh}) {
                 $cacheFactory.get('templates').remove(tab.templateUrl);
             });
             tabs = [];
+            service.resetTabs();
             service.reloadPatchers();
             service.loadSettings();
         });

From 93af764dd5a14fcc899d342e6c6bcdccc2f77b35 Mon Sep 17 00:00:00 2001
From: Martin Rudat <mrudat@toraboka.com>
Date: Thu, 11 Jun 2020 17:53:24 +1000
Subject: [PATCH 2/2] Support for patcherPath != `modules\${info.id}`

---
 src/Runners/upfLoader.js       | 2 ++
 src/Services/patcherService.js | 7 ++-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/Runners/upfLoader.js b/src/Runners/upfLoader.js
index 5516da4..dab5b2c 100644
--- a/src/Runners/upfLoader.js
+++ b/src/Runners/upfLoader.js
@@ -3,6 +3,8 @@ module.exports = function({moduleService, ngapp}) {
 
     ngapp.run(function($rootScope, patcherService) {
         let upfLoader = function({module, fh, moduleService}) {
+            // save the path for if we need to reload later.
+            module.info.path = module.path;
             moduleService.executeModule(module, {
                 registerPatcher: patcherService.registerPatcher,
                 fh: fh,
diff --git a/src/Services/patcherService.js b/src/Services/patcherService.js
index fb2ccfb..d6c2fc9 100644
--- a/src/Services/patcherService.js
+++ b/src/Services/patcherService.js
@@ -98,12 +98,9 @@ module.exports = function({ngapp, moduleUrl, fh}) {
         };
 
         this.reloadPatchers = function() {
-            let patcherIds = patchers.map(patcher => patcher.info.id);
+            let patcherPaths = patchers.map(patcher => patcher.info.path);
             patchers = [];
-            patcherIds.forEach(id => {
-                let patcherPath = fh.jetpack.path(`modules\\${id}`);
-                moduleService.loadModule(patcherPath);
-            });
+            patcherPaths.forEach(moduleService.loadModule);
         };
 
         this.updateForGameMode = function(gameMode) {