diff options
| -rw-r--r-- | MediaBrowser.Installer/MainWindow.xaml.cs | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/MediaBrowser.Installer/MainWindow.xaml.cs b/MediaBrowser.Installer/MainWindow.xaml.cs index ee87e9bf2..a3becf631 100644 --- a/MediaBrowser.Installer/MainWindow.xaml.cs +++ b/MediaBrowser.Installer/MainWindow.xaml.cs @@ -269,22 +269,13 @@ namespace MediaBrowser.Installer { ExtractPackage(archive); // We're done with it so delete it (this is necessary for update operations) - try - { - File.Delete(archive); - } - catch (FileNotFoundException) - { - } - catch (Exception e) - { - SystemClose("Error Removing Archive - " + e.GetType().FullName + "\n\n" + e.Message); - return; - } + TryDelete(archive); } catch (Exception e) { SystemClose("Error Extracting - " + e.GetType().FullName + "\n\n" + e.Message); + // Delete archive even if failed so we don't try again with this one + TryDelete(archive); return; } @@ -337,6 +328,23 @@ namespace MediaBrowser.Installer } + private bool TryDelete(string file) + { + try + { + File.Delete(file); + } + catch (FileNotFoundException) + { + } + catch (Exception e) + { + return false; + } + + return true; + } + private void PismoInstall() { // Kick off the Pismo installer and wait for it to end |