Author: mir3x Date: Tue Dec 23 18:47:24 2014 New Revision: 27389 URL: http://svn.gna.org/viewcvs/freeciv?rev=27389&view=rev Log: "Leave Game" didn't close the help dialog, leading to crashes. Fixed.
Reported and patch submitted by Louis Moureaux <louis94> See bug #23095 Modified: branches/S2_5/client/gui-qt/dialogs.cpp branches/S2_5/client/gui-qt/helpdlg.cpp Modified: branches/S2_5/client/gui-qt/dialogs.cpp URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-qt/dialogs.cpp?rev=27389&r1=27388&r2=27389&view=diff ============================================================================== --- branches/S2_5/client/gui-qt/dialogs.cpp (original) +++ branches/S2_5/client/gui-qt/dialogs.cpp Tue Dec 23 18:47:24 2014 @@ -1882,6 +1882,8 @@ for (i = 0; i < cd_list.count(); i++) { cd_list[i]->close(); } + + popdown_help_dialog(); } /**************************************************************** Modified: branches/S2_5/client/gui-qt/helpdlg.cpp URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-qt/helpdlg.cpp?rev=27389&r1=27388&r2=27389&view=diff ============================================================================== --- branches/S2_5/client/gui-qt/helpdlg.cpp (original) +++ branches/S2_5/client/gui-qt/helpdlg.cpp Tue Dec 23 18:47:24 2014 @@ -94,6 +94,8 @@ { if (help_dlg) { help_dlg->setVisible(false); + help_dlg->deleteLater(); + help_dlg = NULL; } } _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits