External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 13:02:06 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'fork/master'

Browse source
This commit is contained in:
vraskulin 2017-03-22 14:51:31 +03:00
commit d3214c65e4
7 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java
View file

@ -391,7 +391,7 @@ public class ConnectDialog extends MageDialog {
connection.setUsername(this.txtUserName.getText().trim());
connection.setPassword(this.txtPassword.getText().trim());
connection.setForceDBComparison(this.chkForceUpdateDB.isSelected());
connection.setUserIdStr(System.getProperty("user.name") + ":" + MagePreferences.getUserNames());
connection.setUserIdStr(System.getProperty("user.name") + ':' + MagePreferences.getUserNames());
MageFrame.getPreferences().put(KEY_CONNECT_FLAG, ((CountryItemEditor) cbFlag.getEditor()).getImageItem());
PreferencesDialog.setProxyInformation(connection);

2
Mage.Client/src/main/java/mage/client/unusedFiles/DelayedViewerThread.java
View file

@ -24,7 +24,7 @@ public class DelayedViewerThread extends Thread {
public synchronized void show(Component component, long delay) {
delayedViewers.put(component, System.currentTimeMillis() + delay);
notify();
notifyAll();
}
public synchronized void hide(Component component) {