Allow unsetting crosshair

lacymorrow · Oct 8, 2019 · 37b203c · 37b203c
1 parent 55a4b2b
commit 37b203c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/index.js b/index.js
@@ -71,6 +71,7 @@ function prettify(str) {
 const setupCrosshairInput = () => {
 	// Crosshair select options
 	const crosshair = config.get('crosshair')
+	console.log(crosshair)
 
 	return new Promise((resolve, reject) => {
 		const crosshairs = []
@@ -91,9 +92,9 @@ const setupCrosshairInput = () => {
 				}
 			}
 
-			for (let i = 1; i <= crosshairs.length; i++) {
+			for (let i = 0; i < crosshairs.length; i++) {
 				mainWindow.webContents.executeJavaScript(
-					`document.querySelector("#crosshairs").options[${i}] = new Option('${prettify(
+					`document.querySelector("#crosshairs").options[${i+1}] = new Option('${prettify(
 						crosshairs[i]
 					)}', '${crosshairs[i]}');`
 				)
@@ -111,6 +112,7 @@ const setupCrosshairInput = () => {
 					`document.querySelector('#crosshairImg').src = 'static/crosshairs/${crosshair}.png'`
 				)
 			}
+
 			mainWindow.webContents.executeJavaScript(
 				`
 					for(let i = 0; i < document.querySelector("#crosshairs").options.length; i++) {

diff --git a/src/renderer.js b/src/renderer.js
@@ -62,13 +62,15 @@
 	// Crosshair
 	crosshairsInput.addEventListener('change', () => {
 		const crosshair = crosshairsInput.value
+
 		if (crosshairsInput.value === 'none') {
 			crosshairImg.style.display = 'none'
 		} else {
 			crosshairImg.src = `static/crosshairs/${crosshair}.png`
 			crosshairImg.style.display = 'block'
-			ipcRenderer.send('set_crosshair', crosshairsInput.value)
 		}
+
+		ipcRenderer.send('set_crosshair', crosshairsInput.value)
 	})
 
 	// Color