diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-03-17 17:40:51 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-03-17 17:40:51 +0000 |
| commit | 7cd92ce49a6d5474361190248e7caed176fae743 (patch) | |
| tree | cf93e4742951d1697ac0ba0de823642717330111 /win32 | |
| parent | 585287338ed2eb6f1443d838911632eff243a998 (diff) | |
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
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/win32.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |