diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-01-11 16:53:26 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-01-11 16:53:26 -0600 |
| commit | c91e96258b6c127201397dd5309c4433655e63b2 (patch) | |
| tree | 85682ed6f7056b51a95e85cf1711ffcc74588d34 /kexi/main | |
| parent | 5ec453c2580654ef1d9c019964fa3b9cf3c601a9 (diff) | |
| download | koffice-c91e96258b6c127201397dd5309c4433655e63b2.tar.gz koffice-c91e96258b6c127201397dd5309c4433655e63b2.zip | |
Apply a number of kexi patches
This closes Bug 777
Diffstat (limited to 'kexi/main')
| -rw-r--r-- | kexi/main/keximainwindowimpl.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp index 5e39ab13..f6be589a 100644 --- a/kexi/main/keximainwindowimpl.cpp +++ b/kexi/main/keximainwindowimpl.cpp @@ -4203,8 +4203,10 @@ void KexiMainWindowImpl::slotToolsCompactDatabase() data = new KexiProjectData(*d->prj->data()); // a copy drv = d->prj->dbConnection()->driver(); const tristate res = closeProject(); - if (~res || !res) + if (~res || !res) { + delete data; return; + } } if (!drv->adminTools().vacuum(*data->connectionData(), data->databaseName())) { @@ -4212,10 +4214,9 @@ void KexiMainWindowImpl::slotToolsCompactDatabase() showErrorMessage( &drv->adminTools() ); } - if (data && projectWasOpened) { + if (projectWasOpened) openProject(*data); - delete data; - } + delete data; } tristate KexiMainWindowImpl::showProjectMigrationWizard( |