1 files changed, 10 insertions, 0 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java
index 455cb2ad..b5c50ba1 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java
@@ -7,6 +7,7 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -113,6 +114,15 @@ public class ThriftActions {
 				}
 
 				if (sat == null) {
+					if (!forceCustomSatellite) {
+						// Remove testing servers (those starting with {x}) if shift was not pressed
+						for (Iterator<Satellite> it = data.satellites.iterator(); it.hasNext();) {
+							Satellite entry = it.next();
+							if (entry.displayName != null && entry.displayName.startsWith("{x}")) {
+								it.remove();
+							}
+						}
+					}
 					sat = SatelliteListWindow.open(window, data.satellites);
 					if (sat == null)
 						return false;