- #1570 - Confirmation needed before restore backup and overwrite local data

2 files changed, 6 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 8ac976d..218aacf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,8 +16,9 @@
 	* #1542 - Fix Todo crash when priority < 1 or > 5 (drw)
 	* #1554 - Fixed Opie-Console name in .desktop file (mickeyl)
 	* #1556 - Start to look for sound files in /opt/QtPalmtop/sounds (zecke)
 	* #1558 - Fixed opie-login breaking opie startup (mickeyl)
+	* #1570 - Confirmation needed befor Restore a backup and overwrite local data (ar)
 	* n.a.  - PackageManager - fixed where last package in status file was not shown as installed when it should be (drw)
 
 	Internal
 	--------
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
@@ -586,8 +586,13 @@ void BackupAndRestore::restore()
                               tr( "Please select something to restore." ),QString( tr( "Ok") ) );
         return;
     }
 
+    if ( QMessageBox::warning( this, tr( "Restore" ), 
+                                     tr( "Would you really overwrite your local data?" ), 
+                                     tr( "Yes" ), tr( "No" ), "", 1 ) == 1 )
+        return;
+
     OWait *owait = new OWait();
     Global::statusMessage( tr( "Restore Backup..." ) );
     owait->show();
     qApp->processEvents();