diff --git a/ChangeLog b/ChangeLog
index 8de1f472c6..4c7fef81b3 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 b54ab744f8..d06d1278fc 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;