claunia/osrepodbmgr
1
0
Fork 0
mirror of https://github.com/claunia/osrepodbmgr.git synced 2025-12-16 19:14:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not exception on thread abort.

Browse Source
This commit is contained in:
Natalia Portillo
2017-06-13 18:21:12 +01:00
parent 379d29ca02
commit bc1dadefaa
7 changed files with 107 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
osrepodbmgr.Core/Workers/Compression.cs
View File

@@ -299,12 +299,17 @@ namespace osrepodbmgr.Core
if(FinishedWithText != null)
FinishedWithText(string.Format("Correctly added operating system with MDID {0}", mdid));
}
catch(ThreadAbortException)
{ }
catch(Exception ex)
{
if(Debugger.IsAttached)
throw;
if(Failed != null)
Failed(string.Format("Exception {0}\n{1}", ex.Message, ex.InnerException));
#if DEBUG
Console.WriteLine("Exception {0}\n{1}", ex.Message, ex.InnerException);
#endif
}
}
@@ -433,12 +438,17 @@ namespace osrepodbmgr.Core
if(Finished != null)
Finished();
}
catch(ThreadAbortException)
{ }
catch(Exception ex)
{
if(Debugger.IsAttached)
throw;
if(Failed != null)
Failed(string.Format("Exception {0}\n{1}", ex.Message, ex.InnerException));
#if DEBUG
Console.WriteLine("Exception {0}\n{1}", ex.Message, ex.InnerException);
#endif
}
}
@@ -471,6 +481,8 @@ namespace osrepodbmgr.Core
Context.tmpFolder = tmpFolder;
}
catch(ThreadAbortException)
{ }
catch(Exception)
{
if(Debugger.IsAttached)
@@ -507,6 +519,9 @@ namespace osrepodbmgr.Core
throw;
if(Failed != null)
Failed(string.Format("Exception {0}\n{1}", ex.Message, ex.InnerException));
#if DEBUG
Console.WriteLine("Exception {0}\n{1}", ex.Message, ex.InnerException);
#endif
}
}
else
@@ -548,12 +563,17 @@ namespace osrepodbmgr.Core
Finished();
}
}
catch(ThreadAbortException)
{ }
catch(Exception ex)
{
if(Debugger.IsAttached)
throw;
if(Failed != null)
Failed(string.Format("Exception {0}\n{1}", ex.Message, ex.InnerException));
#if DEBUG
Console.WriteLine("Exception {0}\n{1}", ex.Message, ex.InnerException);
#endif
}
}
@@ -692,12 +712,17 @@ namespace osrepodbmgr.Core
zipCurrentEntryName = "";
zf.Save();
}
catch(ThreadAbortException)
{ }
catch(Exception ex)
{
if(Debugger.IsAttached)
throw;
if(Failed != null)
Failed(string.Format("Exception {0}\n{1}", ex.Message, ex.InnerException));
#if DEBUG
Console.WriteLine("Exception {0}\n{1}", ex.Message, ex.InnerException);
#endif
}
}