From 808434313cf8d1434e41bafb6299a28598b50715 Mon Sep 17 00:00:00 2001 From: Markus Gans Date: Thu, 3 May 2018 04:54:51 +0200 Subject: [PATCH] Fix resetColorMap in FTerm --- ChangeLog | 3 +++ src/fterm.cpp | 9 +++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 49015758..1c3f51aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2017-05-03 Markus Gans + * Fix resetColorMap in FTerm + 2017-05-02 Markus Gans * Outsourcing of data from FTerm to the classes FTermios, FTermDetection and FTermcapQuirks diff --git a/src/fterm.cpp b/src/fterm.cpp index 4eb96a60..193c0d68 100644 --- a/src/fterm.cpp +++ b/src/fterm.cpp @@ -1124,12 +1124,10 @@ void FTerm::saveColorMap() //---------------------------------------------------------------------- void FTerm::resetColorMap() { - char*& op = TCAP(fc::t_orig_pair); char*& oc = TCAP(fc::t_orig_colors); + char*& op = TCAP(fc::t_orig_pair); - if ( op ) - putstring (op); - else if ( oc ) + if ( oc ) putstring (oc); /*else { @@ -1153,6 +1151,9 @@ void FTerm::resetColorMap() ioctl (0, PIO_CMAP, &color_map); }*/ + if ( op ) + putstring (op); + std::fflush(stdout); }