From 46d7523160bd5c5a36bc7010cd213e9698ca8536 Mon Sep 17 00:00:00 2001 From: Tats Date: Fri, 17 Jul 2015 14:36:33 -0600 Subject: [PATCH] Bug fix: upon quitting the output window prevented the app to actually quit. --- MainWindow.cpp | 2 +- OutputGLWindow.cpp | 2 +- OutputGLWindow.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MainWindow.cpp b/MainWindow.cpp index a960021..267265c 100644 --- a/MainWindow.cpp +++ b/MainWindow.cpp @@ -1182,7 +1182,7 @@ void MainWindow::createLayout() destinationCanvas->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); destinationCanvas->setMinimumSize(CANVAS_MINIMUM_WIDTH, CANVAS_MINIMUM_HEIGHT); - outputWindow = new OutputGLWindow(destinationCanvas); + outputWindow = new OutputGLWindow(this, destinationCanvas); outputWindow->setVisible(true); outputWindow->installEventFilter(destinationCanvas); outputWindow->installEventFilter(this); diff --git a/OutputGLWindow.cpp b/OutputGLWindow.cpp index 630789d..728487e 100644 --- a/OutputGLWindow.cpp +++ b/OutputGLWindow.cpp @@ -23,7 +23,7 @@ #include "MainWindow.h" -OutputGLWindow:: OutputGLWindow(const DestinationGLCanvas* canvas_) +OutputGLWindow:: OutputGLWindow(QWidget* parent, const DestinationGLCanvas* canvas_) : QDialog(parent) { resize(MainWindow::OUTPUT_WINDOW_MINIMUM_WIDTH, MainWindow::OUTPUT_WINDOW_MINIMUM_HEIGHT); diff --git a/OutputGLWindow.h b/OutputGLWindow.h index c646d9f..fc90fc8 100644 --- a/OutputGLWindow.h +++ b/OutputGLWindow.h @@ -34,7 +34,7 @@ class OutputGLWindow : public QDialog Q_OBJECT public: - OutputGLWindow(const DestinationGLCanvas* canvas_); + OutputGLWindow(QWidget* parent, const DestinationGLCanvas* canvas_); //OutputGLWindow(MainWindow* mainWindow, QWidget* parent = 0, const QGLWidget * shareWidget = 0); public slots: