* sync with trunk

* disabled ILMerge for PH.Common and PH.Native

git-svn-id: svn://svn.code.sf.net/p/processhacker/code@2159 21ef857c-d57f-4fe0-8362-d861dc6d29cd
This commit is contained in:
wj32
2009-10-12 23:31:32 +00:00
parent d556f41b71
commit 2d50e7d9b9
8 changed files with 126 additions and 33 deletions
@@ -101,6 +101,7 @@ namespace ProcessHacker
new System.Collections.Specialized.StringCollection();
public static int InspectPid = -1;
public static bool NoKph = false;
public static bool Recovered = false;
public static string SelectTab = "Processes";
public static bool StartHidden = false;
public static bool StartVisible = false;
@@ -150,9 +151,10 @@ namespace ProcessHacker
return;
}
if (pArgs.ContainsKey("-recovered")) //used for Windows Error Reporting recovery
if (pArgs.ContainsKey("-recovered")) // used for Windows Error Reporting recovery
{
ProcessHackerRestartRecovery.ApplicationRestartRecoveryManager.RecoverLastSession();
Recovered = true;
//ProcessHackerRestartRecovery.ApplicationRestartRecoveryManager.RecoverLastSession();
}
if (pArgs.ContainsKey("-elevate"))