Author: mir3x
Date: Sat Oct 15 00:31:07 2016
New Revision: 34125
URL: http://svn.gna.org/viewcvs/freeciv?rev=34125&view=rev
Log:
Qt client - Fixed crash in hud_message_box
Reported by Louis Moureaux <louis94>
See bug #25168
Modified:
trunk/client/gui-qt/hudwidget.cpp
trunk/client/gui-qt/hudwidget.h
trunk/client/gui-qt/repodlgs.cpp
Modified: trunk/client/gui-qt/hudwidget.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/hudwidget.cpp?rev=34125&r1=34124&r2=34125&view=diff
==============================================================================
--- trunk/client/gui-qt/hudwidget.cpp (original)
+++ trunk/client/gui-qt/hudwidget.cpp Sat Oct 15 00:31:07 2016
@@ -53,6 +53,19 @@
top = 0;
hide();
mult = 1;
+}
+
+/****************************************************************************
+ Key press event for hud message box
+****************************************************************************/
+void hud_message_box::keyPressEvent(QKeyEvent *event)
+{
+ if (event->key() == Qt::Key_Escape) {
+ close();
+ destroy();
+ event->accept();
+ }
+ QWidget::keyPressEvent(event);
}
/****************************************************************************
Modified: trunk/client/gui-qt/hudwidget.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/hudwidget.h?rev=34125&r1=34124&r2=34125&view=diff
==============================================================================
--- trunk/client/gui-qt/hudwidget.h (original)
+++ trunk/client/gui-qt/hudwidget.h Sat Oct 15 00:31:07 2016
@@ -37,6 +37,7 @@
protected:
void paintEvent(QPaintEvent *event);
void timerEvent(QTimerEvent *event);
+ void keyPressEvent(QKeyEvent *event);
private:
int m_animate_step;
QString text;
Modified: trunk/client/gui-qt/repodlgs.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/repodlgs.cpp?rev=34125&r1=34124&r2=34125&view=diff
==============================================================================
--- trunk/client/gui-qt/repodlgs.cpp (original)
+++ trunk/client/gui-qt/repodlgs.cpp Sat Oct 15 00:31:07 2016
@@ -1331,6 +1331,8 @@
case QMessageBox::Ok:
disband_all_units(putype, false, buf, sizeof(buf));
break;
+ default:
+ return;
}
s = QString(buf);
ask.set_text_title(s, _("Disband Results"));
@@ -1369,6 +1371,8 @@
case QMessageBox::Ok:
sell_all_improvements(pimprove, false, buf, sizeof(buf));
break;
+ default:
+ return;
}
s = QString(buf);
ask.set_text_title(s, _("Sell-Off: Results"));
@@ -1407,6 +1411,8 @@
case QMessageBox::Ok:
sell_all_improvements(pimprove, true, buf, sizeof(buf));
break;
+ default:
+ return;
}
s = QString(buf);
ask.set_text_title(s, _("Sell-Off: Results"));
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
