Merge branch 'master' of git://github.com/quietust/dfhack

Conflicts: library/LuaTypes.cpp library/LuaWrapper.cpp
2012-03-28 12:14:08 +02:00 · 2012-03-28 12:14:08 +02:00 · baf0785807
parent 4646033741 abebb7fd2d
commit baf0785807
1 changed files with 1 additions and 1 deletions
--- a/library/Console-windows.cpp
+++ b/library/Console-windows.cpp
@ -179,7 +179,7 @@ namespace DFHack
        void color(int index)
        {
            HANDLE hConsole = GetStdHandle(STD_OUTPUT_HANDLE);
-            SetConsoleTextAttribute(hConsole, index);
+            SetConsoleTextAttribute(hConsole, index == color_ostream::COLOR_RESET ? default_attributes : index);
        }

        void reset_color( void )