From b37b57855eb0a117cd87a7e8aafbee3ff0c8de0a Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Fri, 28 Oct 2016 18:07:15 +0200 Subject: [client] Disable "quit on last window closed" as it triggers in exam mode Apparently, invisible windows are treated as closed... --- src/client/clientapp/clientapp.cpp | 1 + src/client/toolbar/toolbar.cpp | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/client/clientapp/clientapp.cpp b/src/client/clientapp/clientapp.cpp index 7711556..d3f0eb4 100644 --- a/src/client/clientapp/clientapp.cpp +++ b/src/client/clientapp/clientapp.cpp @@ -11,6 +11,7 @@ ClientApp::ClientApp(int& argc, char** argv) setOrganizationName("openslx"); setOrganizationDomain("openslx.org"); setApplicationName("pvsclient"); + setQuitOnLastWindowClosed(false); /* configuration */ QSettings::setPath(QSettings::IniFormat, QSettings::SystemScope, "/opt/"); diff --git a/src/client/toolbar/toolbar.cpp b/src/client/toolbar/toolbar.cpp index 8af15f4..19c44cc 100644 --- a/src/client/toolbar/toolbar.cpp +++ b/src/client/toolbar/toolbar.cpp @@ -78,12 +78,14 @@ Toolbar::Toolbar(QWidget *parent) { init(); } + void Toolbar::exit() { this->close(); this->deleteLater(); qApp->quit(); } + void Toolbar::init() { _ui = new Ui::Toolbar; @@ -93,7 +95,9 @@ void Toolbar::init() /* Set window properties */ setWindowFlags(Qt::WindowStaysOnTopHint | Qt::X11BypassWindowManagerHint | Qt::FramelessWindowHint); setAttribute(Qt::WA_AlwaysShowToolTips); - setAttribute(Qt::WA_QuitOnClose); + setAttribute(Qt::WA_QuitOnClose, false); + setAttribute(Qt::WA_DeleteOnClose, false); + /* Create the VNC Window */ _vnc = new VncWindow(NULL); -- cgit v1.2.3-55-g7522