[Flightgear-commitlogs] FlightGear branch, next, updated. 5b17a6c33fab9718217e2cfc5347a7a180d807de

[Flightgear-commitlogs <ma...@hy...>]

The branch, next has been updated

- Log -----------------------------------------------------------------
commit 5b17a6c33fab9718217e2cfc5347a7a180d807de
Author: Thomas Geymayer
Date:   Sat Jul 27 22:15:27 2013 +0200

    Canvas GUI: don't crash if enable decoration on window without content canvas


- Summary -------------------------------------------------------------

 src/Canvas/window.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


- Diff ----------------------------------------------------------------

diff --git a/src/Canvas/window.cxx b/src/Canvas/window.cxx
index d1bbe90..012915f 100644
--- a/src/Canvas/window.cxx
+++ b/src/Canvas/window.cxx
@@ -211,8 +211,8 @@ namespace canvas
     (
       0,
       0,
-      get<int>("content-size[0]", content->getViewWidth()),
-      get<int>("content-size[1]", content->getViewHeight())
+      get<int>("content-size[0]", content ? content->getViewWidth()  : 400),
+      get<int>("content-size[1]", content ? content->getViewHeight() : 300)
     );
 
     if( _decoration_border.isNone() && !shadow_radius )


-----------------------------------------------------------------------


FlightGear