From 2380f6faa48dffadbe6754c227e64eaab616cda3 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 26 Mar 2017 18:23:12 -0400 Subject: [PATCH] kittycat kittycat kittycat kittycat, I'm 100% kittycat --- Project-Unite/Controllers/AdminController.cs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Project-Unite/Controllers/AdminController.cs b/Project-Unite/Controllers/AdminController.cs index a8cd5b5..88fb8a7 100644 --- a/Project-Unite/Controllers/AdminController.cs +++ b/Project-Unite/Controllers/AdminController.cs @@ -122,8 +122,14 @@ Unlike previous ShiftOS site revamps, your account got migrated over. However, t string backupUrl = backupDir.Remove(0, 1) + "/ShiftOS-" + DateTime.Now.ToString() + ".zip"; string backupname = Path.Combine(backupServerDir, "ShiftOS-" + DateTime.Now.ToString() + ".zip"); - System.IO.Compression.ZipFile.CreateFromDirectory(Server.MapPath("~/Uploads"), backupname); - + try + { + System.IO.Compression.ZipFile.CreateFromDirectory(Server.MapPath("~/Uploads"), backupname); + } + catch + { + return Content(backupname); + } var backupData = new AssetBackup(); backupData.Id = Guid.NewGuid().ToString(); backupData.UserId = User.Identity.GetUserId();