Author: mir3x
Date: Thu Jul 28 12:30:33 2016
New Revision: 33346
URL: http://svn.gna.org/viewcvs/freeciv?rev=33346&view=rev
Log:
Qt client - proper disconnect from server.
Reported by Jacob Nevins <jtn>
See bug #24872
Modified:
trunk/client/gui-qt/gui_main.cpp
trunk/client/gui-qt/pages.cpp
Modified: trunk/client/gui-qt/gui_main.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/gui_main.cpp?rev=33346&r1=33345&r2=33346&view=diff
==============================================================================
--- trunk/client/gui-qt/gui_main.cpp (original)
+++ trunk/client/gui-qt/gui_main.cpp Thu Jul 28 12:30:33 2016
@@ -486,6 +486,9 @@
return;
break;
case QMessageBox::Ok:
+ if (client.conn.used) {
+ disconnect_from_server();
+ }
gui()->write_settings();
qapp->quit();
break;
Modified: trunk/client/gui-qt/pages.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/pages.cpp?rev=33346&r1=33345&r2=33346&view=diff
==============================================================================
--- trunk/client/gui-qt/pages.cpp (original)
+++ trunk/client/gui-qt/pages.cpp Thu Jul 28 12:30:33 2016
@@ -448,7 +448,7 @@
but->setText(_("Cancel"));
but->setIcon(QApplication::style()->standardIcon(
QStyle::SP_DialogCancelButton));
- connect(but, SIGNAL(clicked()), switch_page_mapper, SLOT(map()));
+ connect(but, SIGNAL(clicked()), this, SLOT(slot_disconnect()));
switch_page_mapper->setMapping(but, PAGE_MAIN);
pages_layout[PAGE_LOAD]->addWidget(but, 1, 2);
@@ -506,7 +506,7 @@
but->setText(_("Cancel"));
but->setIcon(QApplication::style()->standardIcon(
QStyle::SP_DialogCancelButton));
- connect(but, SIGNAL(clicked()), switch_page_mapper, SLOT(map()));
+ connect(but, SIGNAL(clicked()), this, SLOT(slot_disconnect()));
switch_page_mapper->setMapping(but, PAGE_MAIN);
pages_layout[PAGE_SCENARIO]->addWidget(but, 4, 3);
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
