Merge pull request #235 from wrooot/master

SPARK-1021 Default to Name field as nickname when adding a contact
This commit is contained in:
wroot
2016-10-23 12:56:44 +03:00
committed by GitHub

View File

@ -148,11 +148,11 @@ public class UserSearchResults extends JPanel {
TableColumn column = null; TableColumn column = null;
try { try {
column = resultsTable.getColumn("Username"); column = resultsTable.getColumn("Name");
} }
catch (Exception ex) { catch (Exception ex) {
try { try {
column = resultsTable.getColumn("nick"); column = resultsTable.getColumn("Username");
} }
catch (Exception e1) { catch (Exception e1) {
// Nothing to do // Nothing to do