aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--desktop-widgets/mainwindow.cpp22
1 files changed, 4 insertions, 18 deletions
diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp
index 883b81d23..94c319a4b 100644
--- a/desktop-widgets/mainwindow.cpp
+++ b/desktop-widgets/mainwindow.cpp
@@ -1354,18 +1354,16 @@ void MainWindow::on_action_Check_for_Updates_triggered()
void MainWindow::on_actionUserManual_triggered()
{
#ifndef NO_USERMANUAL
- if (!helpView) {
- helpView = new UserManual();
- }
+ if (!helpView)
+ helpView = new UserManual(this);
helpView->show();
#endif
}
void MainWindow::on_actionUserSurvey_triggered()
{
- if(!survey) {
+ if(!survey)
survey = new UserSurvey(this);
- }
survey->show();
}
@@ -1561,18 +1559,6 @@ void MainWindow::closeEvent(QCloseEvent *event)
return;
}
-#ifndef NO_USERMANUAL
- if (helpView && helpView->isVisible()) {
- helpView->close();
- helpView->deleteLater();
- }
-#endif
-
- if (survey && survey->isVisible()) {
- survey->close();
- survey->deleteLater();
- }
-
if (unsaved_changes() && (askSaveChanges() == false)) {
event->ignore();
return;
@@ -2070,7 +2056,7 @@ void MainWindow::hideProgressBar()
{
if (progressDialog) {
progressDialog->setValue(100);
- progressDialog->deleteLater();
+ delete progressDialog;
progressDialog = NULL;
}
}