summaryrefslogtreecommitdiff
path: root/ship_gui.c
diff options
context:
space:
mode:
authordarkvater <darkvater@openttd.org>2005-01-10 14:24:40 +0000
committerdarkvater <darkvater@openttd.org>2005-01-10 14:24:40 +0000
commit1261a44cec0dd552b62a60f94246ec51aaea76a0 (patch)
tree517f4689d02819fd5f952a2a72a58c1446b75078 /ship_gui.c
parent49e7939a102bbed5066fff9daa3aafb4c3a8564a (diff)
downloadopenttd-1261a44cec0dd552b62a60f94246ec51aaea76a0.tar.xz
(svn r1463) -Fix: [1099451] Game crashes after the click on Rename (see also Bug 10992). There was no check for non-selected engine
Diffstat (limited to 'ship_gui.c')
-rw-r--r--ship_gui.c19
1 files changed, 8 insertions, 11 deletions
diff --git a/ship_gui.c b/ship_gui.c
index f08b3e0d9..491f42c6d 100644
--- a/ship_gui.c
+++ b/ship_gui.c
@@ -402,17 +402,14 @@ static void NewShipWndProc(Window *w, WindowEvent *e)
DoCommandP(w->window_number, sel_eng, 0, CcBuildShip, CMD_BUILD_SHIP | CMD_MSG(STR_980D_CAN_T_BUILD_SHIP));
} break;
- case 6: /* rename */
- WP(w,buildtrain_d).rename_engine = WP(w,buildtrain_d).sel_engine;
- ShowQueryString(
- GetCustomEngineName(WP(w,buildtrain_d).sel_engine),
- STR_9838_RENAME_SHIP_TYPE,
- 31,
- 160,
- w->window_class,
- w->window_number);
- break;
-
+ case 6: { /* rename */
+ int sel_eng = WP(w,buildtrain_d).sel_engine;
+ if (sel_eng != -1) {
+ WP(w,buildtrain_d).rename_engine = sel_eng;
+ ShowQueryString(GetCustomEngineName(sel_eng),
+ STR_9838_RENAME_SHIP_TYPE, 31, 160, w->window_class, w->window_number);
+ }
+ } break;
}
break;