Author: mir3x
Date: Thu Jul  7 15:03:18 2016
New Revision: 33191

URL: http://svn.gna.org/viewcvs/freeciv?rev=33191&view=rev
Log:
In Qt client - when choosing nation default leader name will be player name.

See patch #7367


Modified:
    trunk/client/gui-qt/dialogs.cpp

Modified: trunk/client/gui-qt/dialogs.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/dialogs.cpp?rev=33191&r1=33190&r2=33191&view=diff
==============================================================================
--- trunk/client/gui-qt/dialogs.cpp     (original)
+++ trunk/client/gui-qt/dialogs.cpp     Thu Jul  7 15:03:18 2016
@@ -516,6 +516,7 @@
   helptext_nation(buf, sizeof(buf), nation_by_number(selected_nation), NULL);
   description->setText(buf);
   leader_name->clear();
+  leader_name->addItem(client.conn.playing->name, true);
   nation_leader_list_iterate(nation_leaders(nation_by_number
                                             (selected_nation)), pleader) {
     str = QString::fromUtf8(nation_leader_name(pleader));
@@ -609,7 +610,8 @@
                                  selected_nation, selected_sex,
                                  leader_name->currentText().toUtf8().data(),
                                  selected_style);
-  delete this;
+  close();
+  deleteLater();
 }
 
 /***************************************************************************


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to