Author: mir3x
Date: Wed Jan  6 09:09:44 2016
New Revision: 31375

URL: http://svn.gna.org/viewcvs/freeciv?rev=31375&view=rev
Log:
Fixed closing diplomacy in qt-client not allowing
to reopen meeting with that civilization.

See bug #24246


Modified:
    branches/S2_5/client/gui-qt/diplodlg.cpp

Modified: branches/S2_5/client/gui-qt/diplodlg.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-qt/diplodlg.cpp?rev=31375&r1=31374&r2=31375&view=diff
==============================================================================
--- branches/S2_5/client/gui-qt/diplodlg.cpp    (original)
+++ branches/S2_5/client/gui-qt/diplodlg.cpp    Wed Jan  6 09:09:44 2016
@@ -222,9 +222,7 @@
 ****************************************************************************/
 void diplo_wdg::closeEvent(QCloseEvent *event)
 {
-  if (!gui()->is_closing()) {
-    response_cancel();
-  }
+  response_cancel();
   event->accept();
 }
 
@@ -746,6 +744,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

Reply via email to