]> git.sesse.net Git - vlc/commitdiff
macosx/CAS: fix incorrect channel name field activation in stream panel
authorFelix Paul Kühne <fkuehne@videolan.org>
Thu, 27 Dec 2012 17:10:42 +0000 (18:10 +0100)
committerFelix Paul Kühne <fkuehne@videolan.org>
Fri, 28 Dec 2012 10:15:18 +0000 (11:15 +0100)
modules/gui/macosx/ConvertAndSave.m

index 00146a339661935aa34dd814bd9d8f2f3194b7a4..d41954beb2f74efdfbbaa233d96e16bbe15e5056 100644 (file)
@@ -496,8 +496,6 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
         [_stream_rtsp_ckb setEnabled:YES];
         [_stream_http_ckb setEnabled:YES];
         [_stream_sdp_ckb setEnabled:YES];
-        [_stream_channel_fld setEnabled:YES];
-        [_stream_sdp_fld setEnabled:[_stream_sdp_ckb state]];
     } else { // UDP
         [_stream_ttl_fld setEnabled:YES];
         [_stream_ttl_stepper setEnabled:YES];
@@ -505,12 +503,13 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
         [_stream_rtsp_ckb setEnabled:NO];
         [_stream_http_ckb setEnabled:NO];
         [_stream_sdp_ckb setEnabled:NO];
-        [_stream_channel_fld setEnabled:YES];
     }
+    [self streamAnnouncementToggle:sender];
 }
 
 - (IBAction)streamAnnouncementToggle:(id)sender
 {
+    [_stream_channel_fld setEnabled:([_stream_http_ckb state] || [_stream_rtsp_ckb state] || [_stream_sap_ckb state]) && ([_stream_http_ckb isEnabled] || [_stream_rtsp_ckb isEnabled] || [_stream_sap_ckb isEnabled])];
     [_stream_sdp_fld setEnabled:[_stream_sdp_ckb state]];
 }