2.12.2021, 9:00 - 11:00: Due to updates GitLab may be unavailable for some minutes between 09:00 and 11:00.

Commit 680b2de4 authored by Christian Schulte zu Berge's avatar Christian Schulte zu Berge
Browse files

Fixed crash on Linux Debug builds

parent 275121a4
...@@ -61,7 +61,6 @@ using namespace campvis; ...@@ -61,7 +61,6 @@ using namespace campvis;
**/ **/
int main(int argc, char** argv) { int main(int argc, char** argv) {
#ifdef Q_WS_X11 #ifdef Q_WS_X11
std::cout << "XInitThreads()\n";
XInitThreads(); XInitThreads();
#endif #endif
......
...@@ -55,7 +55,7 @@ namespace campvis { ...@@ -55,7 +55,7 @@ namespace campvis {
const std::string CampVisApplication::loggerCat_ = "CAMPVis.application.CampVisApplication"; const std::string CampVisApplication::loggerCat_ = "CAMPVis.application.CampVisApplication";
CampVisApplication::CampVisApplication(int argc, char** argv, bool useOpenCL) CampVisApplication::CampVisApplication(int& argc, char** argv, bool useOpenCL)
: QApplication(argc, argv) : QApplication(argc, argv)
, _localContext(0) , _localContext(0)
, _mainWindow(0) , _mainWindow(0)
......
...@@ -70,7 +70,7 @@ namespace campvis { ...@@ -70,7 +70,7 @@ namespace campvis {
* \param argv vector of arguments * \param argv vector of arguments
* \param useOpenCL Flag, whether to use OpenCL (inits and deinits KissCL lib at the appropriate time). * \param useOpenCL Flag, whether to use OpenCL (inits and deinits KissCL lib at the appropriate time).
*/ */
CampVisApplication(int argc, char** argv, bool useOpenCL = true); CampVisApplication(int& argc, char** argv, bool useOpenCL = true);
/** /**
* Destructor, make sure to call deinit() first. * Destructor, make sure to call deinit() first.
......
...@@ -77,7 +77,6 @@ namespace campvis { ...@@ -77,7 +77,6 @@ namespace campvis {
} }
VisualizationPipeline::~VisualizationPipeline() { VisualizationPipeline::~VisualizationPipeline() {
_data.s_dataAdded.disconnect(this);
} }
void VisualizationPipeline::onEvent(tgt::Event* e) { void VisualizationPipeline::onEvent(tgt::Event* e) {
...@@ -98,6 +97,9 @@ namespace campvis { ...@@ -98,6 +97,9 @@ namespace campvis {
} }
void VisualizationPipeline::deinit() { void VisualizationPipeline::deinit() {
_data.s_dataAdded.disconnect(this);
_renderTargetID.s_changed.disconnect(this);
AbstractPipeline::deinit(); AbstractPipeline::deinit();
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment