external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 19:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fixups' into 'master'

Browse Source 
Fixups

Closes #680, #676, and #673

See merge request core-developers/forge!905
This commit is contained in:
Michael Kamensky
2018-09-09 05:27:21 +00:00
parent c54ca4c423 e4b146128c
commit 810d55931d
3 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
forge-gui-desktop/src/main/java/forge/screens/home/online/CSubmenuOnlineLobby.java
View File

@@ -1,5 +1,6 @@
package forge.screens.home.online;
import java.net.BindException;
import java.util.ArrayList;
import java.util.List;
@@ -7,6 +8,7 @@ import javax.swing.JMenu;
import javax.swing.SwingUtilities;
import forge.FThreads;
import forge.error.BugReporter;
import forge.gui.FNetOverlay;
import forge.gui.SOverlayUtils;
import forge.gui.framework.EDocID;
@@ -19,6 +21,7 @@ import forge.screens.home.CHomeUI;
import forge.screens.home.CLobby;
import forge.screens.home.VLobby;
import forge.screens.home.sanctioned.ConstructedGameMenu;
import forge.util.gui.SOptionPane;
public enum CSubmenuOnlineLobby implements ICDoc, IMenuProvider {
SINGLETON_INSTANCE;
@@ -41,7 +44,18 @@ public enum CSubmenuOnlineLobby implements ICDoc, IMenuProvider {
join(url);
}
else {
host();
try {
host();
} catch (Exception ex) {
// IntelliJ swears that BindException isn't thrown in this try block, but it is!
if (ex.getClass() == BindException.class) {
SOptionPane.showErrorDialog("Unable to start server, port already in use!");
SOverlayUtils.hideOverlay();
} else {
BugReporter.reportException(ex);
}
;
}
}
}
});