From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Wed, 25 Jan 2012 11:12:19 +0000 (+0100)
Subject: cec: exit cec-client after entering bootloader mode
X-Git-Tag: upstream/2.2.0~1^2~39^2~14
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=38ed5789ff087c524d4c263aff4b947ce34096b0;p=deb_libcec.git

cec: exit cec-client after entering bootloader mode
---

diff --git a/src/testclient/main.cpp b/src/testclient/main.cpp
index 8178449..162c1f1 100644
--- a/src/testclient/main.cpp
+++ b/src/testclient/main.cpp
@@ -57,6 +57,7 @@ uint8_t              g_iHDMIPort(CEC_DEFAULT_HDMI_PORT);
 cec_logical_address  g_iBaseDevice((cec_logical_address)CEC_DEFAULT_BASE_DEVICE);
 cec_device_type_list g_typeList;
 bool                 g_bSingleCommand(false);
+bool                 g_bExit(false);
 CMutex               g_outputMutex;
 ICECCallbacks        g_callbacks;
 
@@ -534,7 +535,11 @@ bool ProcessCommandBL(ICECAdapter *parser, const string &command, string & UNUSE
 {
   if (command == "bl")
   {
-    parser->StartBootloader();
+    if (parser->StartBootloader())
+    {
+      PrintToStdOut("entered bootloader mode. exiting cec-client");
+      g_bExit = true;
+    }
     return true;
   }
 
@@ -1089,22 +1094,21 @@ int main (int argc, char *argv[])
     PrintToStdOut("waiting for input");
   }
 
-  bool bContinue(true);
-  while (bContinue)
+  while (!g_bExit)
   {
     string input;
     getline(cin, input);
     cin.clear();
 
-    if (ProcessConsoleCommand(parser, input) && !g_bSingleCommand)
+    if (ProcessConsoleCommand(parser, input) && !g_bSingleCommand && !g_bExit)
     {
       if (!input.empty())
         PrintToStdOut("waiting for input");
     }
     else
-      bContinue = false;
+      g_bExit = true;
 
-    if (bContinue)
+    if (!g_bExit)
       CCondition::Sleep(50);
   }