merge src/modules/window.js into src/win.js

I intended to do this when creating src/win.js, but wanted it to be in a
different commit, as that commit made pretty large changes as well.

So no more `main_win`, `win_show` and confusion between what `win` is.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/modules/settings.js b/src/modules/settings.js
index ae02c79..5449570 100644
--- a/src/modules/settings.js
+++ b/src/modules/settings.js
@@ -2,11 +2,11 @@ const fs = require("fs");
 const path = require("path");
 const { app, ipcMain } = require("electron");
 
-const json = require("./json");
+const win = require("../win");
 const lang = require("../lang");
-const win = require("./window");
 
 console = require("./console");
+const json = require("./json");
 
 var invalid_settings = false;
 
@@ -15,7 +15,7 @@ ipcMain.on("save-settings", (event, obj) => {
 })
 
 ipcMain.on("reset-config", async () => {
-	let confirmation = await win.confirm(
+	let confirmation = await win().confirm(
 		lang("gui.settings.miscbuttons.reset_config_alert")
 	)