From 7cd92ce49a6d5474361190248e7caed176fae743 Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 17 Mar 2015 17:40:51 +0000
Subject: merge revision(s) r48585,r48587: [Backport #10546]

	* win32/win32.c (constat_reset): do nothing on non-standard
	  console emurators.  [ruby-core:66471] [Bug #10546]
	  console emulators.  [ruby-core:66471] [Bug #10546]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49996 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 win32/win32.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'win32')

diff --git a/win32/win32.c b/win32/win32.c
index 1653bd1aed..b9f52a9294 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -5924,7 +5924,7 @@ constat_reset(HANDLE h)
 {
     st_data_t data;
     struct constat *p;
-    if (!conlist) return;
+    if (!conlist || conlist == conlist_disabled) return;
     if (!st_lookup(conlist, (st_data_t)h, &data)) return;
     p = (struct constat *)data;
     p->vt100.state = constat_init;
-- 
cgit v1.2.3