Author: cazfi
Date: Sat Nov 26 13:39:03 2016
New Revision: 34631
URL: http://svn.gna.org/viewcvs/freeciv?rev=34631&view=rev
Log:
Fixed the way Qt-client popup_terrain_info() checks for empty string.
See bug #25325
Modified:
branches/S2_6/client/gui-qt/hudwidget.cpp
Modified: branches/S2_6/client/gui-qt/hudwidget.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/hudwidget.cpp?rev=34631&r1=34630&r2=34631&view=diff
==============================================================================
--- branches/S2_6/client/gui-qt/hudwidget.cpp (original)
+++ branches/S2_6/client/gui-qt/hudwidget.cpp Sat Nov 26 13:39:03 2016
@@ -1,4 +1,4 @@
-/**********************************************************************
+/***********************************************************************
Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -1530,7 +1530,7 @@
ret = ret + QString(_("Food/Prod/Trade: %1\n"))
.arg(get_tile_output_text(ptile));
t = get_infrastructure_text(ptile->extras);
- if (t != '\0') {
+ if (t != "") {
ret = ret + QString(_("Infrastructure: %1\n")).arg(t);
}
ret = ret + QString(_("Defence bonus: %1%")).arg(terr->defense_bonus);
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
