From 26ae5024fa9688d7def252fc96e81e4ea8aff0db Mon Sep 17 00:00:00 2001 From: martinp876 Date: Mon, 19 Feb 2018 19:23:47 +0000 Subject: [PATCH] HMInfo:correct templistconfig setting git-svn-id: https://svn.fhem.de/fhem/trunk@16225 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/98_HMinfo.pm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/fhem/FHEM/98_HMinfo.pm b/fhem/FHEM/98_HMinfo.pm index 82d3efaeb..6d8eaf561 100644 --- a/fhem/FHEM/98_HMinfo.pm +++ b/fhem/FHEM/98_HMinfo.pm @@ -898,13 +898,15 @@ sub HMinfo_tempListDefFn(@) { ################################################# my ($fn) = shift; $fn = "" if (!defined $fn); my $ret = ""; - my ($n) = devspec2array("TYPE=HMinfo"); - $ret .= "$attr{global}{modpath}/" if ( !$fn || $fn !~ m/^\//); #no path? add modpath - $ret .= AttrVal($n,"configDir",".")."/" if ( !$ret || $ret !~ m/..*\// - && (!$fn || $fn !~ m/^\//));#no dir? add defDir - if (!$fn){ #set filename - my ($f) = split(",",AttrVal($n,"configTempFile","tempList.cfg")); - $ret .= $f; + + if($fn !~ m/\//){ # filename already with path - dont change + my ($n) = devspec2array("TYPE=HMinfo"); + $ret .= AttrVal($n,"configDir",".")."/" if ( !$fn || $fn !~ m/^\//);#no dir? add defDir + $ret = AttrVal("global","modpath",".")."/$ret" if ( !$ret || $ret !~ m/^\//);#no path? add modpath + if (!$fn){ #set filename + my ($f) = split(",",AttrVal($n,"configTempFile","tempList.cfg")); + $ret .= $f; + } } return $ret.$fn; }