Merge commit '008e8dd2152b97abaf2b6c4f9ac385eb1e1d1d6e' into 2.1.0

[casparcg] / shell / main.cpp

diff --git a/shell/main.cpp b/shell/main.cpp
index 76b465d06e522fa75b6add1dc92de7c990316e11..b90bd40018219abba98dc17097a27fa220b08756 100644 (file)
--- a/shell/main.cpp
+++ b/shell/main.cpp
@@ -114,12 +114,12 @@ void do_run(
                std::promise<bool>& shutdown_server_now,
                tbb::atomic<bool>& should_wait_for_keypress)
 {
+       ensure_gpf_handler_installed_for_thread("Console thread");
        std::wstring wcmd;
        while(true)
        {
-               std::getline(std::wcin, wcmd); // TODO: It's blocking...
-
-               //boost::to_upper(wcmd);
+               if (!std::getline(std::wcin, wcmd))             // TODO: It's blocking...
+                       wcmd = L"EXIT";                                         // EOF, handle as EXIT
 
                if(boost::iequals(wcmd, L"EXIT") || boost::iequals(wcmd, L"Q") || boost::iequals(wcmd, L"QUIT") || boost::iequals(wcmd, L"BYE"))
                {