From 9c9b0d1c6d27f971151bab2ea31ed024b15abf43 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Wed, 2 Sep 2015 10:48:10 +0200
Subject: [PATCH] One more fix for #1490786.

---
 pcbnew/pcbframe.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pcbnew/pcbframe.cpp b/pcbnew/pcbframe.cpp
index e0055df472..004ca762bf 100644
--- a/pcbnew/pcbframe.cpp
+++ b/pcbnew/pcbframe.cpp
@@ -661,12 +661,17 @@ void PCB_EDIT_FRAME::Show3D_Frame( wxCommandEvent& event )
 
 void PCB_EDIT_FRAME::UseGalCanvas( bool aEnable )
 {
-    PCB_BASE_EDIT_FRAME::UseGalCanvas( aEnable );
-
-    if( aEnable && GetBoard() )
-        GetBoard()->GetRatsnest()->ProcessBoard();
+    if( aEnable )
+    {
+        if( ( BOARD* board = GetBoard() ) )
+            board->GetRatsnest()->ProcessBoard();
+    }
     else
+    {
         Compile_Ratsnest( NULL, true );
+    }
+
+    PCB_BASE_EDIT_FRAME::UseGalCanvas( aEnable );
 
     enableGALSpecificMenus();
 }