From: David Roden <github-a8in@qsheltier.de>
Date: Sat, 25 Jan 2025 11:53:32 +0000 (+0100)
Subject: 🐛 Only send a single new-window/frame event for each window/frame
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=9b021cddf4547ef2ceb523c5f09e51b29cafb980;p=msta.git

🐛 Only send a single new-window/frame event for each window/frame
---

diff --git a/server/src/main/java/de/qsheltier/msta/Server.java b/server/src/main/java/de/qsheltier/msta/Server.java
index e5b02a5..f9419a4 100644
--- a/server/src/main/java/de/qsheltier/msta/Server.java
+++ b/server/src/main/java/de/qsheltier/msta/Server.java
@@ -147,9 +147,7 @@ public class Server implements Closeable {
 							.map(window -> "{\"event\":\"new-frame\"}")
 							.forEach(writeLine);
 
-					lastOpenWindows.clear();
 					lastOpenWindows.addAll(openWindows);
-					lastOpenFrames.clear();
 					lastOpenFrames.addAll(openFrames);
 					try {
 						Thread.sleep(100);
diff --git a/server/src/test/java/de/qsheltier/msta/ServerTest.java b/server/src/test/java/de/qsheltier/msta/ServerTest.java
index d25b448..c724a8d 100644
--- a/server/src/test/java/de/qsheltier/msta/ServerTest.java
+++ b/server/src/test/java/de/qsheltier/msta/ServerTest.java
@@ -105,6 +105,22 @@ public class ServerTest {
 
 	@Test
 	@Timeout(value = 5, unit = TimeUnit.SECONDS, threadMode = SEPARATE_THREAD)
+	public void serverSendsASingleEventWhenAFrameIsOpened() throws Throwable {
+		var frame = new Frame("Frame Title");
+		frame.setVisible(true);
+		try {
+			connectToServerAndWaitForEvent(reader -> {
+				reader.readLine();
+				Thread.sleep(1000);
+				assertThat(reader.ready(), equalTo(false));
+			});
+		} finally {
+			frame.setVisible(false);
+		}
+	}
+
+	@Test
+	@Timeout(value = 5, unit = TimeUnit.SECONDS, threadMode = SEPARATE_THREAD)
 	public void serverCanHandleMultipleConnections() throws Exception {
 		try (var server = new Server()) {
 			server.start();