let's not let pops take us below zero

microsoft · Jul 15, 2019 · 0af275b · 0af275b
1 parent 0e478e5
commit 0af275b
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/cascadia/TerminalCore/TerminalApi.cpp b/src/cascadia/TerminalCore/TerminalApi.cpp
@@ -262,7 +262,7 @@ bool Terminal::PushGraphicsRendition(const ::Microsoft::Console::VirtualTerminal
     else
     {
         // Save everything.
-        if ((_numSgrPushes < _countof(_storedSgrAttributes)) && (_numSgrPushes >= 0))
+        if (_numSgrPushes < _countof(_storedSgrAttributes))
         {
             _storedSgrAttributes[_numSgrPushes] = _buffer->GetCurrentAttributes();
         }
@@ -275,11 +275,14 @@ bool Terminal::PushGraphicsRendition(const ::Microsoft::Console::VirtualTerminal
 
 bool Terminal::PopGraphicsRendition()
 {
-    _numSgrPushes--;
-
-    if ((_numSgrPushes < _countof(_storedSgrAttributes)) && (_numSgrPushes >= 0))
+    if (_numSgrPushes > 0)
     {
-        _buffer->SetCurrentAttributes(_storedSgrAttributes[_numSgrPushes]);
+        _numSgrPushes--;
+
+        if (_numSgrPushes < _countof(_storedSgrAttributes))
+        {
+            _buffer->SetCurrentAttributes(_storedSgrAttributes[_numSgrPushes]);
+        }
     }
 
     return true;