diff --git a/instance/index.ejs b/instance/index.ejs
index e874260257035d6f605f535d6f3690ee3badd2ad..7db1eec9372f5f19042191653a76cb15f9cf5d8f 100644
--- a/instance/index.ejs
+++ b/instance/index.ejs
@@ -12,7 +12,7 @@
<link rel="stylesheet" href="../style/bootstrap-4.5.2-dist/css/bootstrap.min.css" />
<link rel="stylesheet" href="../style/css/instance.css" />
<link rel="stylesheet" href="../style/fontawesome-free-5.15.1-web/css/all.min.css" />
- <script src="./main.js"></script>
+ <script src="./index.js"></script>
<script></script>
</head>
<body>
diff --git a/instance/main.js b/instance/index.js
similarity index 99%
rename from instance/main.js
rename to instance/index.js
index 8e187b07df94f37aa194db7fdaa945500362ef23..87c0b85ee278c7630266adf68310c3f0271de860 100644
--- a/instance/main.js
+++ b/instance/index.js
@@ -233,11 +233,11 @@ function addQueueKaraEventHandlers(element) {
position: element.getElementsByClassName('karaPosition')[0].innerText,
})
);
- element.getElementsByClassName('karaPlayBtn')[0].addEventListener('click', () =>
+ element.getElementsByClassName('karaPlayBtn')[0].addEventListener('click', () => {
ipcRenderer.send('play-kara-queue-pos', {
position: element.getElementsByClassName('karaPosition')[0].innerText,
- })
- );
+ });
+ });
}
function onDragStartDB(event) {
diff --git a/main.js b/main.js
index 741d245306cfebb38bacf7c3af1fc7c0a510aab5..c5651b2671ebdf512ea73ff74851a37f6e572297 100644
--- a/main.js
+++ b/main.js
@@ -285,8 +285,7 @@ ipcMain.on('verify-lektord', (event, arg) => {
loopIntervals.concat([
setInterval(() => {
- if (destroyed) return;
- if (lkt.isQueueUpdated()) {
+ if (!destroyed && lkt.isQueueUpdated()) {
lkt.setQueueUpdated(false);
db.queueAll().then(karas => win.webContents.send('reload-queue-responce', karas));
}
@@ -339,8 +338,7 @@ ipcMain.on('verify-lektord', (event, arg) => {
}, 1000),
/* Has the status of lektord changed? */
setInterval(() => {
- if (destroyed) return;
- if (lkt.isStatusUpdated()) {
+ if (!destroyed && lkt.isStatusUpdated()) {
win.webContents.send('send-state', lkt.getStatus().state);
}
}, 50),