X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcec-config%2Fcec-config.cpp;h=a7335c74a94ccd14bb8f6b75c5233ed9b344d6e3;hb=21d8397898e90f5f90be4b0c7d42922289e8ea25;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..a7335c7 100644 --- a/src/cec-config/cec-config.cpp +++ b/src/cec-config/cec-config.cpp @@ -235,16 +235,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 . 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 . Anything else will cancel this wizard."); string input; getline(cin, input);