# HG changeset patch # User smatz # Date 2009-06-01 13:34:13 # Node ID e5ac2652fcbe0a70115a8fcebb8d71b2cce3a709 # Parent 96304a8a9a1a1349282af222b5e2b6d4df6bee65 (svn r16496) -Codechange: remove one useless dynamic_cast<> diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp --- a/src/rail_gui.cpp +++ b/src/rail_gui.cpp @@ -851,13 +851,13 @@ static void SetupRailToolbar(RailType ra */ void ShowBuildRailToolbar(RailType railtype, int button) { - BuildRailToolbarWindow *w; - if (!Company::IsValidID(_local_company)) return; if (!ValParamRailtype(railtype)) return; + BuildRailToolbarWindow *w = (BuildRailToolbarWindow *)FindWindowById(WC_BUILD_TOOLBAR, TRANSPORT_RAIL); + /* don't recreate the window if we're clicking on a button and the window exists. */ - if (button < 0 || !(w = dynamic_cast(FindWindowById(WC_BUILD_TOOLBAR, TRANSPORT_RAIL)))) { + if (button < 0 || w == NULL) { DeleteWindowByClass(WC_BUILD_TOOLBAR); _cur_railtype = railtype; w = AllocateWindowDescFront(&_build_rail_desc, TRANSPORT_RAIL);