← Back to branch summary

~teejee2008/timeshift/trunk

« back to all changes in this revision

Viewing changes to src/Main.vala

  • Committer: Tony George
  • Date: 2014-11-29 08:29:28 UTC
  • Revision ID: tony.george.kol@gmail.com-20141129082928-7dx8j25dv0k1n0qh
Fixed: Unlock device before checking BTRFS layout

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Main.vala
3411
3411
                        return false;
3412
3412
                }
3413
3413
                else{
 
3414
                        
 
3415
                        //unlock if required
 
3416
                        backup_device = unlock_and_find_device(backup_device, parent_win);
 
3417
                        if (backup_device == null){
 
3418
                                log_error(_("Backup device not found"));
 
3419
                                return false;
 
3420
                        }
 
3421
                                        
3414
3422
                        if (backup_device.type == "btrfs"){
3415
3423
                                //unmount
3416
3424
                                unmount_backup_device();
3438
3446
                                        /* Note: Unmount errors can be ignored.
3439
3447
                                         * Old device will be hidden if new device is mounted successfully
3440
3448
                                         * */
3441
 
                        
3442
 
                                        //unlock if required
3443
 
                                        backup_device = unlock_and_find_device(backup_device, parent_win);
3444
 
                                        if (backup_device == null){
3445
 
                                                log_error(_("Backup device not found"));
3446
 
                                                return false;
3447
 
                                        }
3448
 
                                
 
3449
 
3449
3450
                                        //automount
3450
3451
                                        mount_point_backup = automount(backup_device.uuid,"", mount_point_app);
3451
3452
                                        if (mount_point_backup.length > 0){