From 14e3a0ae5aacb2324d49f995ab6a44ac5c799b2c Mon Sep 17 00:00:00 2001
From: David Hewitt <1939362+davidhewitt@users.noreply.github.com>
Date: Thu, 21 Feb 2019 09:28:33 +0000
Subject: [PATCH] Fix panic on exit with ConPTY

Even though the `ClosePseudoConsole` API does not have a return
value, it was incorrectly queried by the `Drop` implementation for
the ConPTY, leading to a panic on exit.

The definition of this call has been updated to match the actual
function signatures, which resolve this problem.
---
 CHANGELOG.md              |  6 ++++++
 src/tty/windows/conpty.rs | 19 +++----------------
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3288d992..fd3b0e28 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+### Fixed
+
+- Fix panic which could occur when quitting Alacritty on Windows if using the Conpty backend
+
 ## Version 0.2.9
 
 ### Changed
diff --git a/src/tty/windows/conpty.rs b/src/tty/windows/conpty.rs
index 755846e8..f3c6cf5b 100644
--- a/src/tty/windows/conpty.rs
+++ b/src/tty/windows/conpty.rs
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use super::{process_should_exit, Pty, HANDLE};
+use super::{Pty, HANDLE};
 
 use std::i16;
 use std::mem;
@@ -56,7 +56,7 @@ struct ConptyApi {
     CreatePseudoConsole:
         unsafe extern "system" fn(COORD, HANDLE, HANDLE, DWORD, *mut HPCON) -> HRESULT,
     ResizePseudoConsole: unsafe extern "system" fn(HPCON, COORD) -> HRESULT,
-    ClosePseudoConsole: unsafe extern "system" fn(HPCON) -> HRESULT,
+    ClosePseudoConsole: unsafe extern "system" fn(HPCON),
 }
 
 impl ConptyApi {
@@ -95,20 +95,7 @@ pub type ConptyHandle = Arc<Conpty>;
 
 impl Drop for Conpty {
     fn drop(&mut self) {
-        // The pseusdoconsole might already have been closed by the console process exiting.
-        // ClosePseudoConsole will fail with error code 1 in that case.
-        //
-        // This check should be sufficient to avoid that.
-        if !process_should_exit() {
-            let result = unsafe { (self.api.ClosePseudoConsole)(self.handle) };
-
-            // As noted above, if the pseudoconsole is already closed then
-            // ClosePseudoConsole will fail with the error code 1.
-            // (This was not in the MSDN docs as of Nov 2018.)
-            //
-            // If ClosePseudoConsole is successful then result is S_OK.
-            assert!(result == S_OK);
-        }
+        unsafe { (self.api.ClosePseudoConsole)(self.handle) }
     }
 }