Mercurial > hg > openttd

changeset 13436:96f90810731d draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r17945) -Fix (r17940): Absence of main toolbar and/or status bar should not be fatal.
author alberth <alberth@openttd.org>
date Mon, 02 Nov 2009 05:12:58 +0000
parents ce0bf92f9369
children 1ab8e5dfef6c
files src/misc_gui.cpp
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/misc_gui.cpp
+++ b/src/misc_gui.cpp
@@ -593,9 +593,9 @@
 		 * Add a fixed distance 20 to make it less cluttered.
 		 */
 		const Window *w = FindWindowById(WC_MAIN_TOOLBAR, 0);
-		int scr_top = w->top + w->height + 20;
+		int scr_top = ((w != NULL) ? w->top + w->height : 0) + 20;
 		w = FindWindowById(WC_STATUS_BAR, 0);
-		int scr_bot = w->top - 20;
+		int scr_bot = ((w != NULL) ? w->top : _screen.height) - 20;
 
 		Point pt = RemapCoords2(this->position.x, this->position.y);
 		const ViewPort *vp = FindWindowById(WC_MAIN_WINDOW, 0)->viewport;
@@ -810,9 +810,9 @@
 		 * Add a fixed distance 2 so the tooltip floats free from both bars.
 		 */
 		const Window *w = FindWindowById(WC_MAIN_TOOLBAR, 0);
-		int scr_top = w->top + w->height + 2;
+		int scr_top = ((w != NULL) ? w->top + w->height : 0) + 2;
 		w = FindWindowById(WC_STATUS_BAR, 0);
-		int scr_bot = w->top - 2;
+		int scr_bot = ((w != NULL) ? w->top : _screen.height) - 2;
 
 		Point pt;