| nmel | |
| asensi | |
| martinkostolny |
| Krusader |
As in bug #388266, pressing esc or closing the dialog does not stops the space calculation.
This patch adds closeEvent() and keyPressEvent() to solve the problem.
m_updateTimer->isActive() is checked in both functions to avoid calling m_updateTimer->stop() twice, causing a segfault when calculation is finished and the user closes the dialog without using the OK button.
Esc and the close command on the dialog both quit and the calculation ends. When calculation is completed, the same commands just close the dialog.
| Lint Skipped |
| Unit Tests Skipped |
Thanks for the bug fix. I checked the code and tested - it works nicely!
I only have a few minor asks regarding code style consistency as I marked inline.
Please also add the following text to the commit message:
FIXED: [ 388266 ] Closing calculate occupied space window does not abort the calculation
BUG: 388266
(FIXED tag is for release notes, BUG tag is for bugzilla)
| krusader/Panel/krcalcspacedialog.cpp | ||
|---|---|---|
| 41 | QtGui | |
| 88 | space: if ( | |
Thanks Davide! The changes that Nikita (nmel) wrote are also improvements. For my part, I accept this because my performed tests (using Kubuntu 17.10) seemed to work correctly.
Works nicely on Arch Linux. Thanks Davide! :)
I agree with the changes Nikita proposed, but I believe we don't necessarily need another diff update for them here. They can be directly pushed. Therefore I'm accepting.
I also accept to prevent another code review iteration. Please integrate the requested changes into the final commit.