From 4130932d58f5f859490e69f1d118465ca7dd9f8e Mon Sep 17 00:00:00 2001
From: Alan Mason <1923621+2Shirt@users.noreply.github.com>
Date: Mon, 4 Dec 2017 11:44:27 -0800
Subject: [PATCH] Install extensions after Ninite bundle

This prevents the Ninite Firefox install from wiping out the FF extension(s)
---
 .bin/Scripts/install_sw_bundle.py | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/.bin/Scripts/install_sw_bundle.py b/.bin/Scripts/install_sw_bundle.py
index a18925bb..b42d39f1 100644
--- a/.bin/Scripts/install_sw_bundle.py
+++ b/.bin/Scripts/install_sw_bundle.py
@@ -34,15 +34,6 @@ if __name__ == '__main__':
         else:
             answer_mse = False
         
-        if answer_extensions:
-            print_info('Installing Extensions')
-            try_and_print(message='Classic Shell skin...',
-                function=install_classicstart_skin,
-                other_results=other_results)
-            try_and_print(message='Google Chrome extensions...',
-                function=install_chrome_extensions)
-            try_and_print(message='Mozilla Firefox extensions...',
-                function=install_firefox_extensions)
         print_info('Installing Programs')
         if answer_adobe_reader:
             install_adobe_reader()
@@ -51,6 +42,16 @@ if __name__ == '__main__':
         if answer_ninite:
             try_and_print(message='Ninite bundle...',
                 function=install_ninite_bundle, cs='Started', mse=answer_mse)
+        if answer_extensions:
+            wait_for_process('ninite.exe')
+            print_info('Installing Extensions')
+            try_and_print(message='Classic Shell skin...',
+                function=install_classicstart_skin,
+                other_results=other_results)
+            try_and_print(message='Google Chrome extensions...',
+                function=install_chrome_extensions)
+            try_and_print(message='Mozilla Firefox extensions...',
+                function=install_firefox_extensions)
         print_standard('\nDone.')
         exit_script()
     except SystemExit: