diff options
| -rw-r--r-- | src/vm/ceemain.cpp | 8 | ||||
| -rw-r--r-- | src/vm/eeconfig.cpp | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/vm/ceemain.cpp b/src/vm/ceemain.cpp index b09d970947..20b579af9a 100644 --- a/src/vm/ceemain.cpp +++ b/src/vm/ceemain.cpp @@ -446,7 +446,13 @@ static BOOL WINAPI DbgCtrlCHandler(DWORD dwCtrlType) } else #endif // DEBUGGING_SUPPORTED - { + { + if (dwCtrlType == CTRL_CLOSE_EVENT) + { + // Initiate shutdown so the ProcessExit handlers run + ForceEEShutdown(SCA_ReturnWhenShutdownComplete); + } + g_fInControlC = true; // only for weakening assertions in checked build. return FALSE; // keep looking for a real handler. } diff --git a/src/vm/eeconfig.cpp b/src/vm/eeconfig.cpp index a227437356..1b44367e84 100644 --- a/src/vm/eeconfig.cpp +++ b/src/vm/eeconfig.cpp @@ -166,7 +166,6 @@ void *EEConfig::operator new(size_t size) RETURN g_EEConfigMemory; } - /**************************************************************/ HRESULT EEConfig::Init() { @@ -393,7 +392,6 @@ HRESULT EEConfig::Init() // statically link to EEConfig. CLRConfig::RegisterGetConfigValueCallback(&GetConfigValueCallback); - return S_OK; } |