summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-11-26 10:54:35 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-11-26 10:54:35 +0000
commit2e7ed8032d6f24cdc23ec48a00e3c34adbe86493 (patch)
tree82becb3f1ee89617c7cff71921f799c72b93cb85
parent0eadc632c1c377d52965e67a8ef09a80fa54f341 (diff)
win32.c: for non-standard console
* win32/win32.c (constat_reset): do nothing on non-standard console emurators. [ruby-core:66471] [Bug #10546] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48585 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--win32/win32.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8de1f47..4c7fef8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Nov 26 19:54:31 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * win32/win32.c (constat_reset): do nothing on non-standard
+ console emurators. [ruby-core:66471] [Bug #10546]
+
Wed Nov 26 19:44:13 2014 Tanaka Akira <akr@fsij.org>
* lib/tsort.rb: Returns an enumerator if no block is given.
diff --git a/win32/win32.c b/win32/win32.c
index b54ab74..d06d127 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -5952,7 +5952,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;