diff options
author | Christoph VogtlÃĪnder <c.vogtlaender@sigma-surface-science.com> | 2015-11-16 14:13:08 +0100 |
---|---|---|
committer | Katja Marttila <katja.marttila@theqtcompany.com> | 2015-11-19 12:34:59 +0000 |
commit | db18dbdcf13604ed165b944938da88e572462f87 (patch) | |
tree | 83115bdad9728369bb869a0b55cc1369fd42a3af /src/libs/installer/performinstallationform.cpp | |
parent | 666ad7944d63f6e3f0155513bb13a1de666a7d67 (diff) |
Fix null pointer exception in silent mode
Running in silent mode (using gui.setSilent(true) in a controller script)
QApplication::activeWindow() returns a null pointer as no application window
has the focus.
Change-Id: I440746b540110ebf336b6078b87b250660ee95be
Task-number: QTIFW-764
Reviewed-by: Katja Marttila <katja.marttila@theqtcompany.com>
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Diffstat (limited to 'src/libs/installer/performinstallationform.cpp')
-rw-r--r-- | src/libs/installer/performinstallationform.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libs/installer/performinstallationform.cpp b/src/libs/installer/performinstallationform.cpp index d6ffd80a7..ef7e9d2d3 100644 --- a/src/libs/installer/performinstallationform.cpp +++ b/src/libs/installer/performinstallationform.cpp @@ -183,7 +183,7 @@ void PerformInstallationForm::updateProgress() m_progressBar->setValue(progressPercentage); #ifdef Q_OS_WIN if (m_taskButton) { - if (!m_taskButton->window()) + if (!m_taskButton->window() && QApplication::activeWindow()) m_taskButton->setWindow(QApplication::activeWindow()->windowHandle()); m_taskButton->progress()->setValue(progressPercentage); } |