Author: mir3x
Date: Wed Jan 6 09:10:17 2016
New Revision: 31377
URL: http://svn.gna.org/viewcvs/freeciv?rev=31377&view=rev
Log:
Fixed closing diplomacy in qt-client not allowing
to reopen meeting with that civilization.
See bug #24246
Modified:
trunk/client/gui-qt/diplodlg.cpp
Modified: trunk/client/gui-qt/diplodlg.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/diplodlg.cpp?rev=31377&r1=31376&r2=31377&view=diff
==============================================================================
--- trunk/client/gui-qt/diplodlg.cpp (original)
+++ trunk/client/gui-qt/diplodlg.cpp Wed Jan 6 09:10:17 2016
@@ -221,9 +221,7 @@
****************************************************************************/
void diplo_wdg::closeEvent(QCloseEvent *event)
{
- if (!gui()->is_closing()) {
- response_cancel();
- }
+ response_cancel();
event->accept();
}
@@ -756,6 +754,7 @@
while (i.hasNext()) {
i.next();
dw = i.value();
+ dw->close();
removeTab(dw->get_index());
dw->deleteLater();
}
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
