From 918860943623871ed84ef5e022ad3a32cd963819 Mon Sep 17 00:00:00 2001
From: rnv <rnv@opencascade.com>
Date: Fri, 17 Sep 2010 05:29:47 +0000
Subject: [PATCH] Fix for the bug 21922 "WinTC5.1.4: incorrect quit salome"

---
 src/GEOMBase/GEOMBase_Helper.cxx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/GEOMBase/GEOMBase_Helper.cxx b/src/GEOMBase/GEOMBase_Helper.cxx
index 908f77f24..64bdc325f 100755
--- a/src/GEOMBase/GEOMBase_Helper.cxx
+++ b/src/GEOMBase/GEOMBase_Helper.cxx
@@ -95,7 +95,8 @@ GEOMBase_Helper::GEOMBase_Helper( SUIT_Desktop* desktop )
 //================================================================
 GEOMBase_Helper::~GEOMBase_Helper()
 {
-  if ( !SUIT_Session::session()->activeApplication()->desktop() )
+  //rnv: Fix for the "IPAL21922 : WinTC5.1.4: incorrect quit salome"
+  if ( !SUIT_Session::session()->activeApplication() || !SUIT_Session::session()->activeApplication()->desktop() )
     return;
 
   if ( myPreview.size() )