From bffaadc8decd5f52aef62fe0a72507ec83f04aac Mon Sep 17 00:00:00 2001
From: Sebastian Pape <Sebastian.Pape@rwth-aachen.de>
Date: Thu, 26 Jul 2018 16:22:26 +0200
Subject: [PATCH] Fixed crashing at exiting
---
demos/optical_bench/src/laser_menu.cpp | 4 ----
demos/optical_bench/src/lens_menu.cpp | 6 ------
demos/optical_bench/src/optix_context_manager.cpp | 2 +-
3 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/demos/optical_bench/src/laser_menu.cpp b/demos/optical_bench/src/laser_menu.cpp
index 4700991a..18682f06 100644
--- a/demos/optical_bench/src/laser_menu.cpp
+++ b/demos/optical_bench/src/laser_menu.cpp
@@ -164,12 +164,8 @@ LaserMenu::~LaserMenu() {
delete down_tc_;
delete clear_target_;
delete switch_tw_;
- delete text_tw_;
delete slider_wlength_;
- delete text_wlength_;
delete slider_width_;
- delete text_width_;
- delete text_tc_;
}
void LaserMenu::SetCurrentWaveLength(float f) { slider_wlength_->SetValue(f); }
diff --git a/demos/optical_bench/src/lens_menu.cpp b/demos/optical_bench/src/lens_menu.cpp
index f2449ee4..92b80bb5 100644
--- a/demos/optical_bench/src/lens_menu.cpp
+++ b/demos/optical_bench/src/lens_menu.cpp
@@ -149,12 +149,6 @@ LensMenu::~LensMenu() {
delete slider_radius2_;
delete slider_thickness_;
- delete text_lens_radius_;
- delete text_radius1_;
- delete text_radius2_;
- delete text_thickness_;
- delete text_gl_;
-
delete up_l1_;
delete down_l1_;
delete up_l2_;
diff --git a/demos/optical_bench/src/optix_context_manager.cpp b/demos/optical_bench/src/optix_context_manager.cpp
index fc52752b..02ec10b6 100644
--- a/demos/optical_bench/src/optix_context_manager.cpp
+++ b/demos/optical_bench/src/optix_context_manager.cpp
@@ -83,7 +83,7 @@ OptixContextManager::OptixContextManager() {
OptixContextManager::~OptixContextManager() {
if (context_) {
top_object_->destroy();
- debug_material_->destroy();
+ // debug_material_->destroy();
target_material_->destroy();
lens_geomerty_->destroy();
target_geomerty_->destroy();
--
GitLab