Merge pull request #732 from ZoneMinder/fix_rtsp_slash

fix extra slash when adding trackurl to controlurl
2015-02-26 09:53:57 -06:00 · 2015-02-26 09:53:57 -06:00 · 0346aab075
parent 1a17c820f2 3c5b1fd07f
commit 0346aab075
1 changed files with 5 additions and 1 deletions
--- a/src/zm_rtsp.cpp
+++ b/src/zm_rtsp.cpp
@ -440,7 +440,11 @@ int RtspThread::run()
                }
                else
                {
-                    trackUrl += "/" + controlUrl;
+					if ( *trackUrl.rbegin() != '/') {
+						trackUrl += "/" + controlUrl;
+					} else {
+						trackUrl += controlUrl;
+					}
                }
                rtpClock = mediaDesc->getClock();
                codecId = mFormatContext->streams[i]->codec->codec_id;