diff options
| author | David Cole <david.cole@kitware.com> | 2012-05-01 18:10:26 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-05-01 18:10:26 (GMT) |
| commit | 17c65d1c443579dfe684d4b354d74407f3d7dc8e (patch) | |
| tree | 5c255d322b54f93bc2359b2a2c40f748339a1d3e | |
| parent | 8df7aa54f0f78d48e4ed91001ac9ac9d39dbf535 (diff) | |
| parent | 2c050a2e11afe41c89bae8075f8a55bae0e8244e (diff) | |
| download | CMake-17c65d1c443579dfe684d4b354d74407f3d7dc8e.zip CMake-17c65d1c443579dfe684d4b354d74407f3d7dc8e.tar.gz CMake-17c65d1c443579dfe684d4b354d74407f3d7dc8e.tar.bz2 | |
Merge topic 'cmake-gui-thread-wait'
2c050a2 cmake-gui: Wait for configure/generate thread to complete before exiting.
| -rw-r--r-- | Source/QtDialog/CMakeSetupDialog.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/QtDialog/CMakeSetupDialog.cxx b/Source/QtDialog/CMakeSetupDialog.cxx index 45b4cd3..5cd4f29 100644 --- a/Source/QtDialog/CMakeSetupDialog.cxx +++ b/Source/QtDialog/CMakeSetupDialog.cxx @@ -288,7 +288,7 @@ CMakeSetupDialog::~CMakeSetupDialog() // wait for thread to stop this->CMakeThread->quit(); - this->CMakeThread->wait(2000); + this->CMakeThread->wait(); } bool CMakeSetupDialog::prepareConfigure() |