make sure we always update the state. fix static analysis error

microsoft · Dec 16, 2019 · e20291e · e20291e
1 parent ae3e8a4
commit e20291e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/terminal/parser/InputStateMachineEngine.cpp b/src/terminal/parser/InputStateMachineEngine.cpp
@@ -320,8 +320,8 @@ bool InputStateMachineEngine::ActionCsiDispatch(const wchar_t wch,
             DWORD dwEventFlags = 0;
             dwModifierState = _GetSGRMouseModifierState(rgusParams, cParams);
             fSuccess = _GetXYPosition(rgusParams, cParams, &row, &col);
-            fSuccess = fSuccess ? _UpdateSGRMouseButtonState(wch, rgusParams, &dwButtonState, &dwEventFlags) : false;
-            return fSuccess ? _WriteMouseEvent(col, row, dwButtonState, dwModifierState, dwEventFlags) : false;
+            fSuccess = _UpdateSGRMouseButtonState(wch, rgusParams, &dwButtonState, &dwEventFlags) && fSuccess;
+            return _WriteMouseEvent(col, row, dwButtonState, dwModifierState, dwEventFlags) && fSuccess;
         }
         default:
             fSuccess = false;

diff --git a/src/terminal/parser/ut_parser/InputEngineTest.cpp b/src/terminal/parser/ut_parser/InputEngineTest.cpp
@@ -989,7 +989,7 @@ void InputEngineTest::VerifySGRMouseData(const std::vector<std::tuple<SGR_PARAMS
     SGR_PARAMS input;
     MOUSE_EVENT_PARAMS expected;
     INPUT_RECORD inputRec;
-    for (int i = 0; i < testData.size(); i++)
+    for (size_t i = 0; i < testData.size(); i++)
     {
         // construct test input
         input = std::get<0>(testData[i]);