This might actually work. Move clean up code to closeEvent

Author: dcwhite

src/Externals/spire/es-render/FBOMan.cpp

@@ -181,17 +181,21 @@ namespace ren {
   {
     auto contFBO = core.getOrCreateComponentContainer<ren::FBO>();
     auto component = contFBO->getComponent(getEntityIDForName(assetName));
-    if (!component.first || hasFBO(assetName) == 0)
+    if (!component.first)
     {
       return createFBO(core, ttype, npixelx, npixely, npixelz, assetName);
     }
     else
     {
       FBOData fboData = getFBOData(assetName);
       if (fboData.numPixelsX == npixelx && fboData.numPixelsY == npixely)
+      {
         return component.first->glid;
+      }
       else
+      {
         return resizeFBO(core, assetName, npixelx, npixely, npixelz);
+      }
     }
   }
 

src/Interface/Modules/Render/ES/RendererInterface.h

@@ -81,6 +81,7 @@ namespace SCIRun
       virtual void setMouseMode(MouseMode mode) = 0;
       virtual void eventResize(size_t width, size_t height) = 0;
       virtual void doFrame(double constantDeltaTime) = 0;
+      virtual void cleanupSelect() = 0;
     };
 
     class SCISHARE RendererModuleInterface

src/Interface/Modules/Render/ES/SRInterface.cc

@@ -216,15 +216,6 @@ void SRInterface::runGCOnNextExecution()
     void SRInterface::widgetMouseUp()
     {
       widgetUpdater_.reset();
-      {
-        std::weak_ptr<ren::FBOMan> fm = mCore.getStaticComponent<ren::StaticFBOMan>()->instance_;
-        std::shared_ptr<ren::FBOMan> fboMan = fm.lock();
-        if (fboMan && widgetSelectFboId_)
-        {
-          fboMan->removeInMemoryFBO(*widgetSelectFboId_);
-          widgetSelectFboId_ = boost::none;
-        }
-      }
     }
 
     //----------------------------------------------------------------------------------------------
@@ -269,6 +260,20 @@ void SRInterface::runGCOnNextExecution()
     //---------------- Camera ----------------------------------------------------------------------
     //----------------------------------------------------------------------------------------------
 
+    void SRInterface::cleanupSelect()
+    {
+      if (widgetSelectFboId_)
+      {
+        std::weak_ptr<ren::FBOMan> fm = mCore.getStaticComponent<ren::StaticFBOMan>()->instance_;
+        std::shared_ptr<ren::FBOMan> fboMan = fm.lock();
+        if (fboMan)
+        {
+          fboMan->removeInMemoryFBO(*widgetSelectFboId_);
+          widgetSelectFboId_ = boost::none;
+        }
+      }
+    }
+
     //----------------------------------------------------------------------------------------------
     void SRInterface::eventResize(size_t width, size_t height)
     {

src/Interface/Modules/Render/ES/SRInterface.h

@@ -146,6 +146,7 @@ namespace SCIRun
       // Garbage collect all invalid objects not given in the valid objects vector.
       void gcInvalidObjects(const std::vector<std::string>& validObjects) override;
       Core::Geometry::BBox getSceneBox() override {return mSceneBBox;}
+      void cleanupSelect() override;
 
       bool hasShaderPromise() const override;
       void runGCOnNextExecution() override;

src/Interface/Modules/Render/GLWidget.cc

@@ -134,14 +134,14 @@ void GLWidget::resizeGL(int width, int height)
   makeCurrent();
   graphics_->eventResize(static_cast<size_t>(width),
                          static_cast<size_t>(height));
-  //updateRenderer();
 }
 
 //------------------------------------------------------------------------------
 void GLWidget::closeEvent(QCloseEvent *evt)
 {
-  if (graphics_ != nullptr)
+  if (graphics_)
   {
+    graphics_->cleanupSelect();
     graphics_.reset();
   }
   QOpenGLWidget::closeEvent(evt);
@@ -150,7 +150,7 @@ void GLWidget::closeEvent(QCloseEvent *evt)
 //------------------------------------------------------------------------------
 void GLWidget::updateRenderer()
 {
-  if(isValid())
+  if (isValid())
   {
     update();
   }