Merge remote-tracking branch 'origin/stable'

src/routes/setup.js

@@ -6,9 +6,8 @@ const utils = require('../services/utils');
 
 async function setupPage(req, res) {
     if (await sqlInit.isDbInitialized()) {
-        const windowService = require('../services/window');
-
         if (utils.isElectron()) {
+            const windowService = require('../services/window');
             await windowService.createMainWindow();
             windowService.closeSetupWindow();
         }

src/services/window.js

@@ -165,6 +165,5 @@ module.exports = {
     createMainWindow,
     createSetupWindow,
     closeSetupWindow,
-    createExtraWindow,
     registerGlobalShortcuts
 };

src/views/setup.ejs

@@ -210,7 +210,7 @@
 
 <script src="libraries/knockout.min.js"></script>
 
-<script src="app-dist/setup.js" crossorigin type="module"></script>
+<script src="app/setup.js" crossorigin type="module"></script>
 <link href="stylesheets/themes.css" rel="stylesheet">
 </body>
 </html>