diff options
| author | Ken Moore <ken@pcbsd.org> | 2015-05-23 07:46:18 -0400 |
|---|---|---|
| committer | Ken Moore <ken@pcbsd.org> | 2015-05-23 07:46:18 -0400 |
| commit | 5b94a2901def97e14f25183a06b91a26abfa26e2 (patch) | |
| tree | 3e728a9f7b41568320c5dad02bb7ef567df077d9 /lumina-desktop/desktop-plugins | |
| parent | Merge branch 'master' of github.com:pcbsd/lumina (diff) | |
| download | lumina-5b94a2901def97e14f25183a06b91a26abfa26e2.tar.gz lumina-5b94a2901def97e14f25183a06b91a26abfa26e2.tar.bz2 lumina-5b94a2901def97e14f25183a06b91a26abfa26e2.zip | |
Fix the random issue with desktop crashes when removing a desktop plugin (only able to reproduce on a 11.x VM).
Diffstat (limited to 'lumina-desktop/desktop-plugins')
| -rw-r--r-- | lumina-desktop/desktop-plugins/LDPluginContainer.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lumina-desktop/desktop-plugins/LDPluginContainer.h b/lumina-desktop/desktop-plugins/LDPluginContainer.h index 14b87585..04ae8262 100644 --- a/lumina-desktop/desktop-plugins/LDPluginContainer.h +++ b/lumina-desktop/desktop-plugins/LDPluginContainer.h @@ -122,12 +122,12 @@ protected: if( !this->whatsThis().isEmpty() && !locked){ //Plugin removed by the user - delete the settings file locked = true; //ensure that the save settings routines don't do anything during the close - if(syncTimer->isActive()){ syncTimer->stop(); } //prevent save routine from running in a moment - QFile::remove( settings->fileName() ); + //QFile::remove( settings->fileName() ); emit PluginRemoved( this->whatsThis() ); } + if(syncTimer->isActive()){ syncTimer->stop(); } //prevent save routine from running in a moment settings = 0; //ensure we don't touch the settings file after a close event - event->accept(); + QMdiSubWindow::closeEvent(event); //continue closing this window } }; |