Fix crash after manually closing Clara download status message box

This commit is contained in:
David Rowe 2016-12-16 12:49:26 +13:00
parent 18a3555453
commit 9aaf55e6a3

View file

@ -5884,7 +5884,7 @@ void Application::addAssetToWorldInfoTimeout() {
If list empty, close the message box unless an error is being displayed. If list empty, close the message box unless an error is being displayed.
*/ */
if (!_addAssetToWorldErrorTimer.isActive()) { if (!_addAssetToWorldErrorTimer.isActive() && _addAssetToWorldMessageBox) {
if (_addAssetToWorldInfoKeys.length() > 0) { if (_addAssetToWorldInfoKeys.length() > 0) {
_addAssetToWorldMessageBox->setProperty("text", "\n" + _addAssetToWorldInfoMessages.last()); _addAssetToWorldMessageBox->setProperty("text", "\n" + _addAssetToWorldInfoMessages.last());
} else { } else {
@ -5935,13 +5935,15 @@ void Application::addAssetToWorldErrorTimeout() {
If list is empty, close the message box. If list is empty, close the message box.
*/ */
if (_addAssetToWorldInfoKeys.length() > 0) { if (_addAssetToWorldMessageBox) {
_addAssetToWorldMessageBox->setProperty("text", "\n" + _addAssetToWorldInfoMessages.last()); if (_addAssetToWorldInfoKeys.length() > 0) {
} else { _addAssetToWorldMessageBox->setProperty("text", "\n" + _addAssetToWorldInfoMessages.last());
disconnect(_addAssetToWorldMessageBox); } else {
_addAssetToWorldMessageBox->setVisible(false); disconnect(_addAssetToWorldMessageBox);
_addAssetToWorldMessageBox->deleteLater(); _addAssetToWorldMessageBox->setVisible(false);
_addAssetToWorldMessageBox = nullptr; _addAssetToWorldMessageBox->deleteLater();
_addAssetToWorldMessageBox = nullptr;
}
} }
} }