-rw-r--r-- | ChangeLog | 1 | ||||
-rw-r--r-- | noncore/settings/backup/backuprestore.cpp | 5 |
2 files changed, 6 insertions, 0 deletions
@@ -18,4 +18,5 @@ | |||
18 | * #1556 - Start to look for sound files in /opt/QtPalmtop/sounds (zecke) | 18 | * #1556 - Start to look for sound files in /opt/QtPalmtop/sounds (zecke) |
19 | * #1558 - Fixed opie-login breaking opie startup (mickeyl) | 19 | * #1558 - Fixed opie-login breaking opie startup (mickeyl) |
20 | * #1570 - Confirmation needed befor Restore a backup and overwrite local data (ar) | ||
20 | * n.a. - PackageManager - fixed where last package in status file was not shown as installed when it should be (drw) | 21 | * n.a. - PackageManager - fixed where last package in status file was not shown as installed when it should be (drw) |
21 | 22 | ||
diff --git a/noncore/settings/backup/backuprestore.cpp b/noncore/settings/backup/backuprestore.cpp index 8928cda..180980a 100644 --- a/noncore/settings/backup/backuprestore.cpp +++ b/noncore/settings/backup/backuprestore.cpp | |||
@@ -588,4 +588,9 @@ void BackupAndRestore::restore() | |||
588 | } | 588 | } |
589 | 589 | ||
590 | if ( QMessageBox::warning( this, tr( "Restore" ), | ||
591 | tr( "Would you really overwrite your local data?" ), | ||
592 | tr( "Yes" ), tr( "No" ), "", 1 ) == 1 ) | ||
593 | return; | ||
594 | |||
590 | OWait *owait = new OWait(); | 595 | OWait *owait = new OWait(); |
591 | Global::statusMessage( tr( "Restore Backup..." ) ); | 596 | Global::statusMessage( tr( "Restore Backup..." ) ); |