External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-23 11:49:56 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'Network_Upgrade' of https://github.com/magefree/mage into Network_Upgrade

Browse source
This commit is contained in:
betasteward 2015-08-21 10:41:31 -04:00
commit b3d739e2c0
5 changed files with 40 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Mage.Client/src/main/java/mage/client/MageFrame.java
View file

@ -765,6 +765,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
public boolean connect(Connection connection) {
client = new Client(instance);
boolean result = client.connect(connection, version);
setWindowTitle();
if (result) {
updateDatabase(connection.isForceDBComparison(), serverState);
}

2
Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java
View file

@ -191,7 +191,7 @@ public class DeckEditorPanel extends javax.swing.JPanel {
//this.cardTableSelector.loadCards(this.bigCard);
this.btnExit.setVisible(true);
this.btnImport.setVisible(true);
if (!MageFrame.getClient().getServerState().isTestMode()) {
if (MageFrame.getClient().getServerState() != null && !MageFrame.getClient().getServerState().isTestMode()) {
this.btnLoad.setVisible(true);
}
this.deckArea.showSideboard(true);