summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVille Skyttä <ville.skytta@iki.fi>2011-02-13 22:18:32 +0200
committerVille Skyttä <ville.skytta@iki.fi>2011-02-13 22:18:32 +0200
commit32a960efa757f7ae292f5676554b9e6a514dbda8 (patch)
treefbc718175b1456290970ae6641b94a818652ba21
parenta8075bc638e458a8523f0c1f1fb8834a55a13fd8 (diff)
downloadvdradmin-am-32a960efa757f7ae292f5676554b9e6a514dbda8.tar.gz
vdradmin-am-32a960efa757f7ae292f5676554b9e6a514dbda8.tar.bz2
Return earlier from command() when SVDRP connection fails.
-rwxr-xr-xvdradmind.pl6
1 files changed, 4 insertions, 2 deletions
diff --git a/vdradmind.pl b/vdradmind.pl
index 08a8985..4162bd4 100755
--- a/vdradmind.pl
+++ b/vdradmind.pl
@@ -6942,7 +6942,7 @@ sub myconnect {
main::HTMLError(sprintf($ERROR_MESSAGE{connect_failed},
$CONFIG{VDR_HOST}, $CONFIG{VDR_PORT},
CGI::escapeHTML($connect_error)));
- return;
+ return 0;
}
$connected = true;
@@ -6956,6 +6956,8 @@ sub myconnect {
$line =~ /^220.*VideoDiskRecorder (\d+)\.(\d+)\.(\d+).*; .*; (.*)\r|$/;
$VDR_ENCODING = $4;
$need_recode = ($can_use_encode and $VDR_ENCODING and $VDR_ENCODING ne $MY_ENCODING) ? 1 : 0;
+
+ return 1;
}
sub getSupportedFeatures {
@@ -6997,7 +6999,7 @@ sub command {
my $cmd = join("", @_);
if (!$connected) {
- myconnect($this);
+ myconnect($this) or return;
}
main::Log(LOG_DEBUG, sprintf("[SVDRP] Sending \"%s\"", $cmd));