X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcec-config%2Fcec-config.cpp;h=5dbb9c8de19f6226ff26c8ee646cde7e48915bc7;hb=ce37a9b17b1eee6488f6d3cdba534d5da71c3ea4;hp=b7a278beb354f6d598b184b2dd1bef41a6e6c017;hpb=86393878734d316e04319c739dd45fc90c50bef8;p=deb_libcec.git

diff --git a/src/cec-config/cec-config.cpp b/src/cec-config/cec-config.cpp
index b7a278b..5dbb9c8 100644
--- a/src/cec-config/cec-config.cpp
+++ b/src/cec-config/cec-config.cpp
@@ -144,7 +144,6 @@ void EnableCallbacks(ICECAdapter *adapter)
   g_callbacks.CBCecLogMessage = &CecLogMessage;
   g_callbacks.CBCecKeyPress   = &CecKeyPress;
   g_callbacks.CBCecCommand    = &CecCommand;
-  g_callbacks.CBCecConfigurationChanged = NULL;
   adapter->EnableCallbacks(NULL, &g_callbacks);
 }
 
@@ -235,16 +234,13 @@ int8_t FindPhysicalAddressPortNumber(void)
   if (input.empty())
     return -1;
 
-  int8_t hdmiport = atoi(input.c_str());
-  if (hdmiport < 1 || hdmiport > 15)
-      return -1;
-
-  return hdmiport;
+  int hdmiport = atoi(input.c_str());
+  return (hdmiport < 1 || hdmiport > 15) ? -1 : (int8_t)hdmiport;
 }
 
 cec_logical_address FindPhysicalAddressBaseDevice(void)
 {
-  PrintToStdOut("Press 1 of your CEC adapter is connected to your TV or\npress 2 if it's connected to an AVR, followed by <enter>. Anything else will cancel this wizard.");
+  PrintToStdOut("Press 1 if your CEC adapter is connected to your TV or\npress 2 if it's connected to an AVR, followed by <enter>. Anything else will cancel this wizard.");
 
   string input;
   getline(cin, input);