Currently job artifacts in CI/CD pipelines on LRZ GitLab never expire. Starting from Wed 26.1.2022 the default expiration time will be 30 days (GitLab default). Currently existing artifacts in already completed jobs will not be affected by the change. The latest artifacts for all jobs in the latest successful pipelines will be kept. More information: https://gitlab.lrz.de/help/user/admin_area/settings/continuous_integration.html#default-artifacts-expiration

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;
**/
int main(int argc, char** argv) {
#ifdef Q_WS_X11
std::cout << "XInitThreads()\n";
XInitThreads();
#endif
......
......@@ -55,7 +55,7 @@ namespace campvis {
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)
, _localContext(0)
, _mainWindow(0)
......
......@@ -70,7 +70,7 @@ namespace campvis {
* \param argv vector of arguments
* \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.
......
......@@ -77,7 +77,6 @@ namespace campvis {
}
VisualizationPipeline::~VisualizationPipeline() {
_data.s_dataAdded.disconnect(this);
}
void VisualizationPipeline::onEvent(tgt::Event* e) {
......@@ -98,6 +97,9 @@ namespace campvis {
}
void VisualizationPipeline::deinit() {
_data.s_dataAdded.disconnect(this);
_renderTargetID.s_changed.disconnect(this);
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