products/patches/OSCAR-GUI-V9_12_0.patch

   1 diff --git a/CMakeLists.txt b/CMakeLists.txt
   2 index d487b162d..be4a9687e 100644
   3 --- a/CMakeLists.txt
   4 +++ b/CMakeLists.txt
   5 @@ -53,7 +53,10 @@ ELSE(EXISTS ${KERNEL_ROOT_DIR})
   6  ENDIF(EXISTS ${KERNEL_ROOT_DIR})
   7
   8  # Find SalomeBootstrap
   9 -FIND_PACKAGE(SalomeBootstrap REQUIRED)
  10 +
  11 +IF(SALOME_ON_DEMAND)
  12 +  FIND_PACKAGE(SalomeBootstrap REQUIRED)
  13 +ENDIF(SALOME_ON_DEMAND)
  14
  15  # Platform setup
  16  # ==============
  17 diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx
  18 index 89fb8ec12..6c0eb05be 100644
  19 --- a/src/LightApp/LightApp_Application.cxx
  20 +++ b/src/LightApp/LightApp_Application.cxx
  21 @@ -2098,15 +2098,10 @@ SUIT_ViewManager* LightApp_Application::createViewManager( const QString& vmType
  22
  23        new LightApp_PV3DSelector( vm, mySelMgr );
  24      }
  25 +  }
  26  #else
  27 -    viewMgr = new PV3DViewer_ViewManager( activeStudy(), desktop() );
  28 -    PV3DViewer_ViewModel* vm = dynamic_cast<PV3DViewer_ViewModel*>( viewMgr->getViewModel() );
  29 -    if ( vm )
  30 -    {
  31 -      // vm->setBackground(...); //NYI
  32 -    }
  33 +    viewMgr = nullptr;
  34  #endif
  35 -  }
  36
  37    if ( !viewMgr )
  38      return 0;
  39 diff --git a/src/Qtx/QtxDockWidget.cxx b/src/Qtx/QtxDockWidget.cxx
  40 index 9247dca99..a96fe2bfe 100644
  41 --- a/src/Qtx/QtxDockWidget.cxx
  42 +++ b/src/Qtx/QtxDockWidget.cxx
  43 @@ -368,9 +368,12 @@ myWatcher( 0 )
  44  */
  45  QtxDockWidget::~QtxDockWidget()
  46  {
  47 -  myWatcher->setParent(nullptr);
  48 -  delete myWatcher;
  49 -  myWatcher = 0;
  50 +  if (myWatcher)
  51 +    {
  52 +      myWatcher->setParent(nullptr);
  53 +      delete myWatcher;
  54 +      myWatcher = 0;
  55 +    }
  56  }
  57
  58  /*!