Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
9.2.2023: Due to updates GitLab will be unavailable for some minutes between 9:00 and 11:00.
Open sidebar
CAMP
campvis-public
Commits
ccad2c19
Commit
ccad2c19
authored
Jan 19, 2015
by
Christian Schulte zu Berge
Browse files
Fixed CampVisApplication deinitialization (possible assertion due to wrong order)
parent
4b54ac8a
Changes
1
Hide whitespace changes
Inline
Side-by-side
application/campvisapplication.cpp
View file @
ccad2c19
...
...
@@ -235,14 +235,8 @@ namespace campvis {
_mainWindow
->
deinit
();
QuadRenderer
::
deinit
();
// deinit OpenGL and cgt
cgt
::
deinitGL
();
}
// MainWindow dtor needs a valid CampVisApplication, so we need to call it here instead of during destruction.
delete
_mainWindow
;
// now delete everything in the right order:
for
(
std
::
vector
<
PipelineRecord
>::
iterator
it
=
_pipelines
.
begin
();
it
!=
_pipelines
.
end
();
++
it
)
{
delete
it
->
_painter
;
...
...
@@ -252,6 +246,12 @@ namespace campvis {
delete
*
it
;
}
{
// Deinit everything OpenGL using the local context.
cgt
::
GLContextScopedLock
lock
(
_localContext
);
cgt
::
deinitGL
();
}
GLJobProc
.
stop
();
OpenGLJobProcessor
::
deinit
();
SimpleJobProcessor
::
deinit
();
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment