Fix bug where console paste mixes up keys

Console paste was broken by the fix to exit w/o delay because
I needed to reconsider the logic of ReadKey instead of just refactoring
the code onto another thread.

Author: lzybkr

PSReadLine/ReadLine.cs

@@ -209,16 +209,12 @@ private void ReadKeyThreadProc()
                     }
                 }
 
-                var key = _queuedKeys.Count > 0
-                    ? _queuedKeys.Dequeue()
-                    : Console.ReadKey(true);
-                if (_captureKeys)
+                if (_queuedKeys.Count == 0)
                 {
-                    _savedKeys.Enqueue(key);
+                    var key = Console.ReadKey(true);
+                    _queuedKeys.Enqueue(key);
                 }
 
-                _queuedKeys.Enqueue(key);
-
                 // One or more keys were read - let ReadKey know we're done.
                 _keyReadWaitHandle.Set();
             }
@@ -250,7 +246,12 @@ private static ConsoleKeyInfo ReadKey()
                 // where we can return from ReadLine.
                 throw new OperationCanceledException();
             }
-            return _singleton._queuedKeys.Dequeue();
+            var key = _singleton._queuedKeys.Dequeue();
+            if (_singleton._captureKeys)
+            {
+                _singleton._savedKeys.Enqueue(key);
+            }
+            return key;
         }
 
         private bool BreakHandler(ConsoleBreakSignal signal)